mx00s/pijul - Change 2VXTRPO4OML5A2RPI7SAEV5SJNOFIVS4TMYYG6TUUS5EXFMAPRJAC

Custom diff separators

Created by pmeunier on October 19, 2021

2VXTRPO4OML5A2RPI7SAEV5SJNOFIVS4TMYYG6TUUS5EXFMAPRJAC

Dependencies

In channels

main

Change contents

Insertion in "libpijul/src/working_copy/filesystem.rs" at line 297 [4.208900]
[3.601]
[3.601]
```
            &crate::diff::DEFAULT_SEPARATOR,
```
Insertion in "libpijul/src/record.rs" at line 282 [4.488880]
[4.492781]
[5.44693]
```
        diff_separator: &regex::bytes::Regex,
```

Insertion in "libpijul/src/record.rs" at line 310 [4.488880]

[5.45425]

[6.72]

            let sep: regex::bytes::Regex = diff_separator.clone();

Insertion in "libpijul/src/record.rs" at line 323 [4.488880]
[7.151]
[8.96746]
```
                            &sep,
```
Insertion in "libpijul/src/record.rs" at line 448 [4.488880]
[7.549]
[8.97839]
```
                    diff_separator,
```
Insertion in "libpijul/src/record.rs" at line 753 [4.488880]
[4.499537]
[8.98069]
```
        diff_sep: &regex::bytes::Regex,
```
Insertion in "libpijul/src/record.rs" at line 877 [4.488880]
[9.149]
[4.503008]
```
                    diff_sep,
```

Replacement in "libpijul/src/pristine/inode.rs" at line 57 [4.643628]

B:BD[2.2085] → [2.2085:2190]

        if data_encoding::BASE32_NOPAD
            .decode_mut(s, &mut b)
            .is_ok()
        {

[2.2085]

[2.2190]

        if data_encoding::BASE32_NOPAD.decode_mut(s, &mut b).is_ok() {

Insertion in "libpijul/src/lib.rs" at line 65 [4.717381]
[8.103585]
[10.27689]
```
pub use crate::diff::DEFAULT_SEPARATOR;
```
Replacement in "libpijul/src/lib.rs" at line 348 [4.717381]
B:BD[2.4579] → [2.4579:4615]
```
        P: changestore::ChangeStore
```
[2.4579]
[2.4615]
```
        P: changestore::ChangeStore,
```
Insertion in "libpijul/src/diff/split.rs" at line 7 [4.778592]
[4.778791]
[4.778791]
```
    m: regex::bytes::Matches<'a, 'a>,
```

Replacement in "libpijul/src/diff/split.rs" at line 11 [4.778592]

B:BD[4.778828] → [4.778828:778867]

    pub fn lines(&self) -> LineSplit {

[4.778828]

[4.778867]

    pub fn lines<'a>(&'a self, r: &'a regex::bytes::Regex) -> LineSplit<'a> {

Insertion in "libpijul/src/diff/split.rs" at line 16 [4.778592]
[4.778996]
[4.778996]
```
            m: r.find_iter(&self.contents_a),
```

Insertion in "libpijul/src/diff/split.rs" at line 23 [4.778592]

[4.779119]

        LineSplit {
            buf,
            missing_eol: None,
            current: 0,
            m: super::DEFAULT_SEPARATOR.find_iter(buf),
        }
    }
}
impl<'a> LineSplit<'a> {
    pub fn from_bytes_with_sep(buf: &'a [u8], sep: &'a regex::bytes::Regex) -> LineSplit<'a> {

Insertion in "libpijul/src/diff/split.rs" at line 38 [4.778592]
[4.779211]
[4.779211]
```
            m: sep.find_iter(buf),
```

Replacement in "libpijul/src/diff/split.rs" at line 46 [4.778592]

B:BD[4.779341] → [4.779341:779822]

        if self.current >= self.buf.len() {
            return None;
        }
        let current = self.current;
        while self.current < self.buf.len() && self.buf[self.current] != b'\n' {
            self.current += 1
        }
        if self.current < self.buf.len() {
            self.current += 1
        }
        let mut last = self.current;
        if let Some(miss) = self.missing_eol {
            if miss.contains(&(self.current - 1)) {
                last -= 1

[4.779341]

[4.779822]

        if let Some(m) = self.m.next() {
            let start = self.current;
            let next = m.end();
            self.current = next;
            let mut last = next;
            if let Some(miss) = self.missing_eol {
                if miss.contains(&(self.current - 1)) {
                    last -= 1
                }

Insertion in "libpijul/src/diff/split.rs" at line 57 [4.778592]

[4.779836]

            Some(&self.buf[start..last])
        } else if self.current < self.buf.len() {
            let cur = self.current;
            self.current = self.buf.len();
            Some(&self.buf[cur..])
        } else {
            None

Deletion in "libpijul/src/diff/split.rs" at line 65 [4.778592]
B:BD[4.779846] → [4.779846:779885]
```
        Some(&self.buf[current..last])
```

Insertion in "libpijul/src/diff/mod.rs" at line 15 [4.793247]

[4.793458]


lazy_static! {
    pub static ref DEFAULT_SEPARATOR: regex::bytes::Regex = regex::bytes::Regex::new("\n").unwrap();
}

Replacement in "libpijul/src/diff/mod.rs" at line 77 [4.793247]

B:BD[11.219] → [11.219:291]

fn make_old_lines(d: &vertex_buffer::Diff) -> Vec<Line> {
    d.lines()

[11.219]

[11.291]

fn make_old_lines<'a>(d: &'a vertex_buffer::Diff, r: &'a regex::bytes::Regex) -> Vec<Line<'a>> {
    d.lines(r)

Replacement in "libpijul/src/diff/mod.rs" at line 111 [4.793247]

B:BD[11.1391] → [11.1391:1464]

fn make_new_lines(b: &[u8]) -> Vec<Line> {
    split::LineSplit::from(b)

[11.1391]

[11.1464]

fn make_new_lines<'a>(b: &'a [u8], sep: &'a regex::bytes::Regex) -> Vec<Line<'a>> {
    split::LineSplit::from_bytes_with_sep(b, sep)

Insertion in "libpijul/src/diff/mod.rs" at line 140 [4.793247]
[9.715]
[12.115897]
```
        separator: &regex::bytes::Regex,
```

Replacement in "libpijul/src/diff/mod.rs" at line 155 [4.793247]

B:BD[11.2253] → [11.2253:2306]

            (make_old_lines(&d), make_new_lines(&b))

[11.2253]

[11.2306]

            (make_old_lines(&d, separator), make_new_lines(&b, separator))

Insertion in "libpijul/src/alive/mod.rs" at line 50 [4.995164]

[4.996237]


    pub fn new(vertex: Vertex<ChangeId>) -> Self {
        AliveVertex {
            vertex,
            flags: Flags::empty(),
            children: 0,
            n_children: 0,
            index: 0,
            lowlink: 0,
            scc: 0,
            extra: Vec::new(),
        }
    }

Replacement in "libpijul/src/alive/mod.rs" at line 66 [4.995164]

B:BD[4.996275] → [4.996275:996315]

B:BD[4.996315] → [13.149336:149391]

    pub(crate) lines: Vec<AliveVertex>,
    children: Vec<(Option<SerializedEdge>, VertexId)>,

[4.996275]

[4.996360]

    pub lines: Vec<AliveVertex>,
    pub children: Vec<(Option<SerializedEdge>, VertexId)>,

Replacement in "libpijul/src/alive/mod.rs" at line 93 [4.995164]

B:BD[4.996938] → [13.149392:149482]

    pub(crate) fn children(&self, i: VertexId) -> &[(Option<SerializedEdge>, VertexId)] {

[4.996938]

[14.7904]

    pub fn push_child_to_last(&mut self, e: Option<SerializedEdge>, j: VertexId) {
        let line = self.lines.last_mut().unwrap();
        self.children.push((e, j));
        line.n_children += 1;
    }
    pub fn children<'a>(
        &'a self,
        i: VertexId,
    ) -> impl Iterator<Item = &'a (Option<SerializedEdge>, VertexId)> {

Replacement in "libpijul/src/alive/mod.rs" at line 104 [4.995164]

∅:D[14.7933] → [4.997050:997121]

B:BD[4.997050] → [4.997050:997121]

        &self.children[line.children..line.children + line.n_children]

[14.7933]

[4.997121]

        (&self.children[line.children..line.children + line.n_children])
            .iter()
            .chain(self[i].extra.iter())

Replacement in "libpijul/src/alive/mod.rs" at line 110 [4.995164]

∅:D[13.149567] → [4.997202:997247]

B:BD[4.997202] → [4.997202:997247]

        &self.children[self[i].children + j]

[13.149567]

[4.997247]

        let line = &self[i];
        if j < line.n_children {
            &self.children[self[i].children + j]
        } else {
            &line.extra[j - line.n_children]
        }

Replacement in "libpijul/src/alive/debug.rs" at line 112 [4.1014531]

B:BD[4.1018658] → [4.1018658:1018777]

            for &(edge, VertexId(j)) in
                &self.children[line.children..line.children + line.n_children]

[4.1018658]

[4.1018777]

            for &(edge, VertexId(j)) in (self.children
                [line.children..line.children + line.n_children])
                .iter()
                .chain(line.extra.iter())

Replacement in "libpijul/src/alive/debug.rs" at line 132 [4.1014531]

B:BD[4.1019363] → [4.1019363:1019429]

                    writeln!(w, "n_{}->n_0[label=\"none\"];", i)?

[4.1019363]

[4.1019429]

                    writeln!(w, "n_{}->n_{}[label=\"none\"];", i, j)?

Replacement in "libpijul/src/alive/debug.rs" at line 156 [4.1014531]

B:BD[4.1020075] → [4.1020075:1020194]

            for &(edge, VertexId(j)) in
                &self.children[line.children..line.children + line.n_children]

[4.1020075]

[4.1020194]

            for &(edge, VertexId(j)) in self.children
                [line.children..line.children + line.n_children]
                .iter()
                .chain(line.extra.iter())

Replacement in "libpijul/src/alive/debug.rs" at line 171 [4.1014531]

B:BD[4.1020569] → [4.1020569:1020635]

                    writeln!(w, "n_{}->n_0[label=\"none\"];", i)?

[4.1020569]

[4.1020635]

                    writeln!(w, "n_{}->n_{}[label=\"none\"];", i, j)?

Custom diff separators

Dependencies

In channels

Change contents

Insertion in "libpijul/src/working_copy/filesystem.rs" at line 297 [4.208900]

Insertion in "libpijul/src/record.rs" at line 282 [4.488880]

Insertion in "libpijul/src/record.rs" at line 310 [4.488880]

Insertion in "libpijul/src/record.rs" at line 323 [4.488880]

Insertion in "libpijul/src/record.rs" at line 448 [4.488880]

Insertion in "libpijul/src/record.rs" at line 753 [4.488880]

Insertion in "libpijul/src/record.rs" at line 877 [4.488880]