laumann/pijul - Change AF5AKUTO7AUAWFO5JS4W5BC5IG2F4EB4MGKYC5Q2CWJCVB65ZRYQC

Cleanup after the text changes refactoring

Created by pmeunier on November 23, 2021

AF5AKUTO7AUAWFO5JS4W5BC5IG2F4EB4MGKYC5Q2CWJCVB65ZRYQC

Dependencies

In channels

main

Change contents

Replacement in pijul/Cargo.toml at line 55 [4.196374]

B:BD[4.197438] → [2.28:118]

libpijul = { path = "../libpijul", version = "1.0.0-alpha.49", features = [ "tarball" ] }

[4.197438]

[4.197523]

libpijul = { path = "../libpijul", version = "1.0.0-alpha.50", features = [ "tarball" ] }

Replacement in libpijul/src/tests/text_changes.rs at line 84 [5.550]

B:BD[5.5849] → [6.266:370]

    let change0 = Change::read_old(std::io::Cursor::new(&v_old[..]), &mut HashMap::default()).unwrap();

[5.5849]

    let change0 =
        Change::read_old(std::io::Cursor::new(&v_old[..]), &mut HashMap::default()).unwrap();

Replacement in libpijul/src/small_string.rs at line 343 [4.480474]
B:BD[7.3395] → [7.3395:3441]
```
impl ::sanakirja::debug::Check for SmallStr{}
```
[7.3395]
[4.488071]
```
impl ::sanakirja::debug::Check for SmallStr {}
```

Replacement in libpijul/src/record.rs at line 466 [4.488880]

B:BD[3.399] → [3.399:502]

                        let age = txn.get_changeset(txn.changes(&*channel), &vertex.change)?.unwrap();

[3.399]

[3.502]

                        let age = txn
                            .get_changeset(txn.changes(&*channel), &vertex.change)?
                            .unwrap();

Replacement in libpijul/src/record.rs at line 761 [4.488880]

B:BD[8.8413] → [3.1255:1339]

                *new_root = Some((Position { change: None, pos: pos2 }, u64::MAX));

[8.8413]

[3.1339]

                *new_root = Some((
                    Position {
                        change: None,
                        pos: pos2,
                    },
                    u64::MAX,
                ));

Replacement in libpijul/src/record.rs at line 1061 [4.488880]

B:BD[3.1506] → [3.1506:1604]

        let item_v_papa = if !moved.edges.is_empty()
            && moved.need_new_name
        {

[3.1506]

[3.1604]

        let item_v_papa = if !moved.edges.is_empty() && moved.need_new_name {

Replacement in libpijul/src/pristine/sanakirja.rs at line 2206 [4.531056]
B:BD[9.94965] → [7.2387:2428]
```
impl ::sanakirja::debug::Check for L64{}
```
[9.94965]
[4.576850]
```
impl ::sanakirja::debug::Check for L64 {}
```
Replacement in libpijul/src/pristine/sanakirja.rs at line 2209 [4.531056]
B:BD[9.94990] → [7.2429:2475]
```
impl ::sanakirja::debug::Check for ChangeId{}
```
[9.94990]
[4.576899]
```
impl ::sanakirja::debug::Check for ChangeId {}
```
Replacement in libpijul/src/pristine/sanakirja.rs at line 2212 [4.531056]
B:BD[9.95023] → [7.2476:2530]
```
impl ::sanakirja::debug::Check for Vertex<ChangeId>{}
```
[9.95023]
[7.2530]
```
impl ::sanakirja::debug::Check for Vertex<ChangeId> {}
```
Replacement in libpijul/src/pristine/sanakirja.rs at line 2215 [4.531056]
B:BD[9.95057] → [7.2532:2588]
```
impl ::sanakirja::debug::Check for Position<ChangeId>{}
```
[9.95057]
[4.578062]
```
impl ::sanakirja::debug::Check for Position<ChangeId> {}
```
Replacement in libpijul/src/pristine/sanakirja.rs at line 2218 [4.531056]
B:BD[9.95088] → [7.2589:2641]
∅:D[7.2641] → [9.95088:95089]
B:BD[9.95088] → [9.95088:95089]
```
impl ::sanakirja::debug::Check for SerializedEdge{}
```
[9.95088]
[7.2642]
```
impl ::sanakirja::debug::Check for SerializedEdge {}
```
Replacement in libpijul/src/pristine/sanakirja.rs at line 2220 [4.531056]
B:BD[7.2643] → [7.2643:2687]
```
impl ::sanakirja::debug::Check for PathId{}
```
[7.2643]
[9.95089]
```
impl ::sanakirja::debug::Check for PathId {}
```
Replacement in libpijul/src/pristine/sanakirja.rs at line 2270 [4.531056]
B:BD[9.96378] → [7.2688:2731]
```
impl ::sanakirja::debug::Check for Inode{}
```
[9.96378]
[9.96378]
```
impl ::sanakirja::debug::Check for Inode {}
```
Replacement in libpijul/src/pristine/sanakirja.rs at line 2272 [4.531056]
B:BD[9.96410] → [7.2732:2786]
```
impl ::sanakirja::debug::Check for SerializedMerkle{}
```
[9.96410]
[9.96410]
```
impl ::sanakirja::debug::Check for SerializedMerkle {}
```
Replacement in libpijul/src/pristine/sanakirja.rs at line 2274 [4.531056]
B:BD[9.96440] → [7.2787:2839]
```
impl ::sanakirja::debug::Check for SerializedHash{}
```
[9.96440]
[4.582759]
```
impl ::sanakirja::debug::Check for SerializedHash {}
```

Replacement in libpijul/src/pristine/sanakirja.rs at line 2276 [4.531056]

B:BD[4.582760] → [7.2840:2949]

impl<A: ::sanakirja::debug::Check, B:  ::sanakirja::debug::Check>  ::sanakirja::debug::Check for Pair<A, B>{

[4.582760]

[7.2949]

impl<A: ::sanakirja::debug::Check, B: ::sanakirja::debug::Check> ::sanakirja::debug::Check
    for Pair<A, B>
{

Replacement in libpijul/src/pristine/sanakirja.rs at line 2328 [4.531056]
B:BD[9.97813] → [7.3235:3289]
```
impl ::sanakirja::debug::Check for SerializedRemote{}
```
[9.97813]
[10.33063]
```
impl ::sanakirja::debug::Check for SerializedRemote {}
```
Replacement in libpijul/src/pristine/sanakirja.rs at line 2390 [4.531056]
B:BD[10.34670] → [7.3290:3345]
```
impl ::sanakirja::debug::Check for SerializedChannel{}
```
[10.34670]
[7.3345]
```
impl ::sanakirja::debug::Check for SerializedChannel {}
```
Replacement in libpijul/src/pristine/sanakirja.rs at line 2393 [4.531056]
B:BD[10.34694] → [7.3347:3393]
```
impl ::sanakirja::debug::Check for RemoteId{}
```
[10.34694]
```
impl ::sanakirja::debug::Check for RemoteId {}
```
Deletion in libpijul/src/change.rs at line 17 [4.831311]
B:BD[11.36136] → [6.406:461]
```
#[cfg(feature = "text-changes")]
mod text_changes_old;
```
Replacement in libpijul/src/change.rs at line 860 [4.831311]
B:BD[8.560] → [8.560:579]
```
                },
```
[8.560]
[4.855085]
```
                }
```

Replacement in libpijul/src/change.rs at line 923 [4.831311]

B:BD[12.5597] → [8.580:679]

                Hunk::AddRoot { ref inode, ref name } | Hunk::DelRoot { ref inode, ref name } => {

[12.5597]

[8.679]

                Hunk::AddRoot {
                    ref inode,
                    ref name,
                }
                | Hunk::DelRoot {
                    ref inode,
                    ref name,
                } => {

Replacement in libpijul/src/change.rs at line 933 [4.831311]
B:BD[8.756] → [8.756:775]
```
                },
```
[8.756]
[4.857285]
```
                }
```

Replacement in libpijul/src/change.rs at line 1015 [4.831311]

B:BD[12.6340] → [8.776:875]

                Hunk::AddRoot { ref name, ref inode } | Hunk::DelRoot { ref name, ref inode } => {

[12.6340]

[8.875]

                Hunk::AddRoot {
                    ref name,
                    ref inode,
                }
                | Hunk::DelRoot {
                    ref name,
                    ref inode,
                } => {

Replacement in libpijul/src/change.rs at line 1025 [4.831311]
B:BD[8.952] → [8.952:971]
```
                },
```
[8.952]
[4.860058]
```
                }
```

Replacement in libpijul/src/change.rs at line 1257 [4.831311]

B:BD[4.866586] → [8.972:1182]

            BaseHunk::AddRoot { name, inode } => BaseHunk::AddRoot { name: f(name)?, inode: f(inode)? },
            BaseHunk::DelRoot { name, inode } => BaseHunk::DelRoot { name: f(name)?, inode: f(inode)? },

[4.866586]

[13.122493]

            BaseHunk::AddRoot { name, inode } => BaseHunk::AddRoot {
                name: f(name)?,
                inode: f(inode)?,
            },
            BaseHunk::DelRoot { name, inode } => BaseHunk::DelRoot {
                name: f(name)?,
                inode: f(inode)?,
            },

Deletion in libpijul/src/change/text_changes.rs at line 473 [11.37976]
B:BD[5.18068] → [5.18068:18116]
```
                    // TODO: should this panic?
```
Replacement in libpijul/src/change/text_changes.rs at line 974 [11.37976]
B:BD[8.5402] → [8.5402:5425]
```
                    })
```
[8.5402]
[8.5425]
```
                    }),
```

Insertion in libpijul/src/change/text_changes.rs at line 1146 [11.37976]

[11.88449]


impl LocalChange<Hunk<Option<Hash>, Local>, Author> {
    pub fn write_all_deps<F: FnMut(Hash) -> Result<(), ChangeError>>(
        &self,
        mut f: F,
    ) -> Result<(), ChangeError> {
        for c in self.changes.iter() {
            for c in c.iter() {
                match *c {
                    Atom::NewVertex(ref n) => {
                        for change in n
                            .up_context
                            .iter()
                            .chain(n.down_context.iter())
                            .map(|c| c.change)
                            .chain(std::iter::once(n.inode.change))
                        {
                            if let Some(change) = change {
                                if let Hash::None = change {
                                    continue;
                                }
                                f(change)?
                            }
                        }
                    }
                    Atom::EdgeMap(ref e) => {
                        for edge in e.edges.iter() {
                            for change in &[
                                edge.from.change,
                                edge.to.change,
                                edge.introduced_by,
                                e.inode.change,
                            ] {
                                if let Some(change) = *change {
                                    if let Hash::None = change {
                                        continue;
                                    }
                                    f(change)?
                                }
                            }
                        }
                    }
                }
            }
        }
        Ok(())
    }
}

Replacement in libpijul/src/change/printable.rs at line 565 [5.36296]

B:BD[5.52014] → [8.6211:6274]

            AddRoot {
                start
            } => {

[5.52014]

[8.6274]

            AddRoot { start } => {

Replacement in libpijul/src/change/printable.rs at line 570 [5.36296]

B:BD[8.6415] → [8.6415:6449]

                    start, start,

[8.6415]

[8.6449]

                    start,
                    start,

Replacement in libpijul/src/change/printable.rs at line 574 [5.36296]

B:BD[8.6483] → [8.6483:6653]

            DelRoot {
                name, inode
            } => {
                writeln!(
                    w,
                    "Root del",
                )?;

[8.6483]

[8.6653]

            DelRoot { name, inode } => {
                writeln!(w, "Root del",)?;

Replacement in libpijul/src/change/parse.rs at line 311 [5.64713]

B:BD[8.7380] → [8.7380:7469]

    Ok((
        i,
        PrintableHunk::AddRoot {
            start
        },
    ))

[8.7380]

[8.7469]

    Ok((i, PrintableHunk::AddRoot { start }))

Deletion in libpijul/src/change/parse.rs at line 315 [5.64713]
B:BD[8.7543] → [8.7543:7544]

Replacement in libpijul/src/change/parse.rs at line 320 [5.64713]

B:BD[8.7732] → [8.7732:7827]

    Ok((
        i,
        PrintableHunk::DelRoot {
            inode, name
        },
    ))

[8.7732]

[8.7827]

    Ok((i, PrintableHunk::DelRoot { inode, name }))

Replacement in libpijul/Cargo.toml at line 4 [4.1020742]
B:BD[4.1020894] → [2.119:146]
```
version = "1.0.0-alpha.49"
```
[4.1020894]
[14.27]
```
version = "1.0.0-alpha.50"
```
Insertion in libpijul/Cargo.toml at line 33 [4.1020742]
[15.230]
[4.1021443]
```
"src/change/parse.rs",
"src/change/printable.rs",
```
Replacement in Cargo.lock at line 1052 [4.1030385]
B:BD[16.22930] → [2.147:174]
```
version = "1.0.0-alpha.49"
```
[16.22930]
[16.22957]
```
version = "1.0.0-alpha.50"
```

Cleanup after the text changes refactoring

Dependencies

In channels

Change contents

Replacement in pijul/Cargo.toml at line 55 [4.196374]

Replacement in libpijul/src/tests/text_changes.rs at line 84 [5.550]

Replacement in libpijul/src/small_string.rs at line 343 [4.480474]

Replacement in libpijul/src/record.rs at line 466 [4.488880]

Replacement in libpijul/src/record.rs at line 761 [4.488880]

Replacement in libpijul/src/record.rs at line 1061 [4.488880]

Replacement in libpijul/src/pristine/sanakirja.rs at line 2206 [4.531056]

Replacement in libpijul/src/pristine/sanakirja.rs at line 2209 [4.531056]

Replacement in libpijul/src/pristine/sanakirja.rs at line 2212 [4.531056]

Replacement in libpijul/src/pristine/sanakirja.rs at line 2215 [4.531056]

Replacement in libpijul/src/pristine/sanakirja.rs at line 2218 [4.531056]

Replacement in libpijul/src/pristine/sanakirja.rs at line 2220 [4.531056]

Replacement in libpijul/src/pristine/sanakirja.rs at line 2270 [4.531056]

Replacement in libpijul/src/pristine/sanakirja.rs at line 2272 [4.531056]

Replacement in libpijul/src/pristine/sanakirja.rs at line 2274 [4.531056]

Replacement in libpijul/src/pristine/sanakirja.rs at line 2276 [4.531056]

Replacement in libpijul/src/pristine/sanakirja.rs at line 2328 [4.531056]

Replacement in libpijul/src/pristine/sanakirja.rs at line 2390 [4.531056]

Replacement in libpijul/src/pristine/sanakirja.rs at line 2393 [4.531056]

Deletion in libpijul/src/change.rs at line 17 [4.831311]

Replacement in libpijul/src/change.rs at line 860 [4.831311]

Replacement in libpijul/src/change.rs at line 923 [4.831311]

Replacement in libpijul/src/change.rs at line 933 [4.831311]

Replacement in libpijul/src/change.rs at line 1015 [4.831311]

Replacement in libpijul/src/change.rs at line 1025 [4.831311]

Replacement in libpijul/src/change.rs at line 1257 [4.831311]

Deletion in libpijul/src/change/text_changes.rs at line 473 [11.37976]

Replacement in libpijul/src/change/text_changes.rs at line 974 [11.37976]

Insertion in libpijul/src/change/text_changes.rs at line 1146 [11.37976]

Replacement in libpijul/src/change/printable.rs at line 565 [5.36296]

Replacement in libpijul/src/change/printable.rs at line 570 [5.36296]

Replacement in libpijul/src/change/printable.rs at line 574 [5.36296]

Replacement in libpijul/src/change/parse.rs at line 311 [5.64713]

Deletion in libpijul/src/change/parse.rs at line 315 [5.64713]

Replacement in libpijul/src/change/parse.rs at line 320 [5.64713]

Replacement in libpijul/Cargo.toml at line 4 [4.1020742]

Insertion in libpijul/Cargo.toml at line 33 [4.1020742]

Replacement in Cargo.lock at line 1052 [4.1030385]