ilyagr/pijul - Change V4T4SC7OL6WEZNV4XSFBSXY5HPB7VXPSXWSK4Z63QXKQD4JSFNCQC

Testing binary diff

Created by pmeunier on July 11, 2021

V4T4SC7OL6WEZNV4XSFBSXY5HPB7VXPSXWSK4Z63QXKQD4JSFNCQC

Dependencies

In channels

main

Change contents

Replacement in pijul/Cargo.toml at line 4 [5.196374]
B:BD[5.196462] → [3.0:27]
```
version = "1.0.0-alpha.50"
```
[5.196462]
[5.196488]
```
version = "1.0.0-alpha.51"
```

Replacement in pijul/Cargo.toml at line 54 [5.196374]

B:BD[5.197438] → [3.125:215]

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

[5.197438]

[5.197523]

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

Insertion in libpijul/src/tests/mod.rs at line 13 [5.289338]
[5.289615]
[5.289615]
```
mod diff;
```

File addition: diff.rs (----------)

[5.248792]

use super::*;
use crate::alive::retrieve;
use rand::distributions::Alphanumeric;
use rand::{Rng, SeedableRng};
use rand_chacha::ChaCha20Rng;
use std::io::Write;
#[test]
fn bin_diff_test() -> Result<(), anyhow::Error> {
    env_logger::try_init().unwrap_or(());
    let repo = working_copy::memory::Memory::new();
    let changes = changestore::memory::Memory::new();
    let mut contents = String::new();
    repo.add_file("file", contents.clone().into());
    let env = pristine::sanakirja::Pristine::new_anon()?;
    let id = {
        let txn = env.arc_txn_begin().unwrap();
        txn.write().add_file("file", 0).unwrap();
        let channel = txn.write().open_or_create_channel("main").unwrap();
        let h = record_all(&repo, &changes, &txn, &channel, "").unwrap();
        let id = *txn.read().get_internal(&h.into()).unwrap().unwrap();
        txn.commit().unwrap();
        id
    };
    let mut rng = ChaCha20Rng::seed_from_u64(1234);
    for i in 0..1000 {
        contents.extend(
            (&mut rng)
                .sample_iter(&Alphanumeric)
                .take(80)
                .map(char::from),
        );
        contents.push('\n');
        repo.write_file("file")
            .unwrap()
            .write_all(contents.as_bytes())
            .unwrap();
        if i % 10 == 0 {
            let txn = env.arc_txn_begin().unwrap();
            let channel = txn.write().open_or_create_channel("main").unwrap();
            record_all(&repo, &changes, &txn, &channel, "").unwrap();
            txn.commit().unwrap();
        }
    }
    {
        let txn = env.arc_txn_begin().unwrap();
        let channel = txn.write().open_or_create_channel("main").unwrap();
        record_all(&repo, &changes, &txn, &channel, "").unwrap();
        txn.commit().unwrap();
    }
    let len = contents.len();
    unsafe {
        let c = contents.as_bytes_mut();
        if c[len / 2] == b'y' {
            c[len / 2] = b'x'
        } else {
            c[len / 2] = b'y'
        }
    }
    {
        let txn = env.arc_txn_begin().unwrap();
        let channel = txn.write().open_or_create_channel("main").unwrap();
        debug_to_file(&*txn.read(), &channel, "debug").unwrap();
        let mut rec = crate::record::Builder::new();
        let rec = rec.recorded();
        let vertex = Position {
            change: id,
            pos: ChangePosition(1u64.into()),
        };
        let mut ret = retrieve(&*txn.read(), txn.read().graph(&*channel.read()), vertex)?;
        rec.lock().diff(
            &changes,
            &*txn.read(),
            &*channel.read(),
            crate::record::Algorithm::Myers,
            String::new(),
            vertex.to_option(),
            &mut ret,
            contents.as_bytes(),
            &None,
        )?;
        debug!("{:#?}", rec.lock().actions);
        record_all(&repo, &changes, &txn, &channel, "").unwrap();
        debug_to_file(&*txn.read(), &channel, "debug").unwrap();
        // txn.commit().unwrap()
    }
    Ok(())
}

Replacement in libpijul/src/diff/replace.rs at line 60 [5.779907]

B:BD[5.781585] → [6.15:141]

        debug!("old {:?}", &lines_a[old..(old + old_len)]);
        debug!("new {:?}", &lines_b[from_new..(from_new + len)]);

[5.781585]

[6.141]

        debug!("old {:?}..{:?}", old, old + old_len);
        trace!("old {:?}", &lines_a[old..(old + old_len)]);
        debug!("new {:?}..{:?}", from_new, from_new + len);
        trace!("new {:?}", &lines_b[from_new..(from_new + len)]);

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

B:BD[5.794015] → [7.505:577]

        (self.ptr == b.ptr || self.l == b.l) && self.cyclic == b.cyclic

[5.794015]

[5.794064]

        ((self.ptr == b.ptr && self.l.len() == b.l.len()) || self.l == b.l)
            && self.cyclic == b.cyclic

Insertion in libpijul/src/diff/mod.rs at line 143 [5.793247]
[8.2024]
[8.2024]
```
            debug!("contents_a: {:?}", d.contents_a.len());
```
Insertion in libpijul/src/diff/bin.rs at line 16 [8.2530]
[8.2994]
[8.2994]
```
            ptr: ch.as_ptr(),
```
Replacement in libpijul/Cargo.toml at line 4 [5.1020742]
B:BD[5.1020894] → [2.97:124]
```
version = "1.0.0-alpha.43"
```
[5.1020894]
[9.27]
```
version = "1.0.0-alpha.44"
```
Replacement in libpijul/Cargo.toml at line 142 [5.1020742]
∅:D[10.326] → [11.16823:16836]
B:BD[11.16823] → [11.16823:16836]
```
rand = "0.5"
```
[10.325]
[11.16836]
```
rand = "0.7"
```
Replacement in libpijul/Cargo.toml at line 152 [5.1020742]
B:BD[12.2206] → [4.106264:106278]
```
detone = "1.0"
```
[12.2206]
```
detone = "1.0"
rand = "0.7"
rand_chacha = "0.2"
```

Deletion in Cargo.lock at line 311 [5.1030385]

B:BD[13.3753] → [13.3753:3977]

name = "cloudabi"
version = "0.0.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
dependencies = [
 "bitflags",
]
[[package]]

Insertion in Cargo.lock at line 454 [5.1030385]

[13.7564]

name = "detone"
version = "1.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f7104c193859c8141dcbb2008bd3d93e581d0fa7bb47b0d9f5e15c89d1b55514"
[[package]]

Deletion in Cargo.lock at line 665 [5.1030385]

B:BD[13.12737] → [13.12737:12934]

name = "fuchsia-cprng"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
[[package]]

Replacement in Cargo.lock at line 1081 [5.1030385]
B:BD[13.22930] → [2.281:308]
```
version = "1.0.0-alpha.43"
```
[13.22930]
[13.22957]
```
version = "1.0.0-alpha.44"
```
Insertion in Cargo.lock at line 1098 [5.1030385]
[13.23175]
[13.23175]
```
 "detone",
```
Insertion in Cargo.lock at line 1111 [5.1030385]
[2.338]
[13.23321]
```
 "parking_lot",
```
Replacement in Cargo.lock at line 1115 [5.1030385]
B:BD[13.23364] → [13.23364:23379]
```
 "rand 0.5.6",
```
[13.23364]
[13.23379]
```
 "rand 0.7.3",
 "rand_chacha 0.2.2",
```
Replacement in Cargo.lock at line 1500 [5.1030385]
B:BD[13.33516] → [3.216:243]
```
version = "1.0.0-alpha.50"
```
[13.33516]
[13.33543]
```
version = "1.0.0-alpha.51"
```

Deletion in Cargo.lock at line 1635 [5.1030385]

B:BD[13.36427] → [13.36427:36705]

version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9"
dependencies = [
 "cloudabi",
 "fuchsia-cprng",
 "libc",
 "rand_core 0.3.1",
 "winapi",
]
[[package]]
name = "rand"

Deletion in Cargo.lock at line 1680 [5.1030385]

B:BD[13.37781] → [13.37781:38206]

version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b"
dependencies = [
 "rand_core 0.4.2",
]
[[package]]
name = "rand_core"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc"
[[package]]
name = "rand_core"

Testing binary diff

Dependencies

In channels

Change contents

Replacement in pijul/Cargo.toml at line 4 [5.196374]

Replacement in pijul/Cargo.toml at line 54 [5.196374]

Insertion in libpijul/src/tests/mod.rs at line 13 [5.289338]

File addition: diff.rs (----------)

Replacement in libpijul/src/diff/replace.rs at line 60 [5.779907]

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

Insertion in libpijul/src/diff/mod.rs at line 143 [5.793247]

Insertion in libpijul/src/diff/bin.rs at line 16 [8.2530]

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

Replacement in libpijul/Cargo.toml at line 142 [5.1020742]

Replacement in libpijul/Cargo.toml at line 152 [5.1020742]

Deletion in Cargo.lock at line 311 [5.1030385]

Insertion in Cargo.lock at line 454 [5.1030385]

Deletion in Cargo.lock at line 665 [5.1030385]

Replacement in Cargo.lock at line 1081 [5.1030385]

Insertion in Cargo.lock at line 1098 [5.1030385]

Insertion in Cargo.lock at line 1111 [5.1030385]

Replacement in Cargo.lock at line 1115 [5.1030385]

Replacement in Cargo.lock at line 1500 [5.1030385]

Deletion in Cargo.lock at line 1635 [5.1030385]

Deletion in Cargo.lock at line 1680 [5.1030385]