jcdickinson/pijul - Change SHSJ3Y5332WHVUDDQZ2P7GH6VMC7XIX5L7BDJUUMF3QCDRZP7NLQC

Fixing more tests

Created by pmeunier on June 1, 2021

SHSJ3Y5332WHVUDDQZ2P7GH6VMC7XIX5L7BDJUUMF3QCDRZP7NLQC

Dependencies

In channels

main

Change contents

Replacement in libpijul/src/tests/text.rs at line 12 [2.10]

B:BD[2.322] → [2.322:378]

    let mut repo = working_copy::memory::Memory::new();

[2.322]

[2.378]

    let repo = Arc::new(working_copy::memory::Memory::new());

Replacement in libpijul/src/tests/text.rs at line 16 [2.10]

B:BD[2.469] → [2.469:594]

    let mut txn = env.mut_txn_begin();
    let mut channel = txn.open_or_create_channel("main")?;
    txn.add_file("file")?;

[2.469]

[2.594]

    let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));
    let channel = txn.write().unwrap().open_or_create_channel("main")?;
    txn.write().unwrap().add_file("file", 0)?;

Replacement in libpijul/src/tests/text.rs at line 21 [2.10]

B:BD[2.647] → [2.647:736]

    let (h, change) = record_all_change(&mut repo, &store, &mut txn, &mut channel, "")?;

[2.647]

[2.736]

    let (h, change) = record_all_change(repo, &store, txn, channel, "")?;

Replacement in libpijul/src/tests/text.rs at line 56 [2.10]

B:BD[2.1539] → [2.1539:1595]

    let mut repo = working_copy::memory::Memory::new();

[2.1539]

[2.1595]

    let repo = Arc::new(working_copy::memory::Memory::new());

Replacement in libpijul/src/tests/text.rs at line 60 [2.10]

B:BD[2.1686] → [2.1686:1811]

    let mut txn = env.mut_txn_begin();
    let mut channel = txn.open_or_create_channel("main")?;
    txn.add_file("file")?;

[2.1686]

[2.1811]

    let txn = Arc::new(RwLock::new(env.mut_txn_begin().unwrap()));
    let channel = txn.write().unwrap().open_or_create_channel("main")?;
    txn.write().unwrap().add_file("file", 0)?;

Replacement in libpijul/src/tests/text.rs at line 65 [2.10]

B:BD[2.1864] → [2.1864:1928]

    record_all(&mut repo, &store, &mut txn, &mut channel, "")?;

[2.1864]

[2.1928]

    record_all(repo.clone(), &store, txn.clone(), channel.clone(), "")?;

Replacement in libpijul/src/tests/text.rs at line 73 [2.10]

B:BD[2.2103] → [2.2103:2312]

    repo.write_file::<_, std::io::Error, _>("file", |w| {
        w.write_all(&buf).unwrap();
        Ok(())
    })?;
    let (h1, change1) = record_all_change(&mut repo, &store, &mut txn, &mut channel, "")?;

[2.2103]

[2.2312]

    use std::io::Write;
    repo.write_file("file").unwrap().write_all(&buf).unwrap();
    let (h1, change1) = record_all_change(repo, &store, txn.clone(), channel.clone(), "")?;

Deletion in libpijul/src/tests/mod.rs at line 23 [5.289338]
B:BD[4.14] → [2.22025:22029]
B:BD[4.14] → [6.224:224]
∅:D[6.224] → [7.4357:4367]
B:BD[5.289715] → [7.4357:4367]
```
 */
mod text;
```
Insertion in libpijul/src/tests/mod.rs at line 24 [5.289338]
[5.289729]
[5.289729]
```
*/
mod text;
```
Replacement in libpijul/src/tests/mod.rs at line 27 [5.289338]
B:BD[5.289730] → [2.22030:22045]
```
fn record_all<
```
[5.289730]
[2.22045]
```
fn record_all_change<
```
Deletion in libpijul/src/tests/mod.rs at line 33 [5.289338]
B:BD[5.289730] → [6.225:291]
BD:BD[5.289730] → [6.225:291]
```
fn record_all_change<T: MutTxnT, R: WorkingCopy, P: ChangeStore>(
```
Solving an order conflict in libpijul/src/tests/mod.rs at line 33 [5.289338]
[2.22202]
[5.289813]
Resurrecting zombie bytes in "libpijul/src/tests/mod.rs" at line 94 [5.289338]
B:B[9.25832] → [6.348:434]
BD:B[9.25832] → [6.348:434]
```
    Ok((hash, change0))
}
fn record_all<T: MutTxnT, R: WorkingCopy, P: ChangeStore>(
```
Solving an order conflict in libpijul/src/tests/mod.rs at line 94 [5.289338]
[2.22654]
[6.348]
Replacement in libpijul/src/tests/mod.rs at line 98 [5.289338]
B:BD[6.434] → [6.434:452]
BD:BD[6.434] → [6.434:452]
```
    repo: &mut R,
```
[6.434]
[6.452]
```
    repo: Arc<R>,
```
Replacement in libpijul/src/tests/mod.rs at line 100 [5.289338]
B:BD[6.467] → [6.467:517]
BD:BD[6.467] → [6.467:517]
```
    txn: &mut T,
    channel: &mut ChannelRef<T>,
```
[6.467]
[6.517]
```
    txn: Arc<RwLock<T>>,
    channel: ChannelRef<T>,
```

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

[6.574]

    T: MutTxnT + Send + Sync + 'static,
    R: WorkingCopy + Send + Sync + 'static,
    P: ChangeStore + Clone + Send + Sync + 'static,

Deletion in libpijul/src/tests/mod.rs at line 110 [5.289338]
B:BD[6.613] → [3.642:708]
```
<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
```
Resurrecting zombie bytes in "libpijul/src/tests/mod.rs" at line 110 [5.289338]
∅:∅[3.708] → [10.0:83]
B:B[6.613] → [10.0:83]
BD:B[6.613] → [10.0:83]
```
    let (hash, _) = record_all_change(repo, store, txn, channel, prefix).unwrap();
```

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

[11.1746]

    T: MutTxnT + Send + Sync + 'static,
    R: WorkingCopy + Send + Sync + 'static,
    P: ChangeStore + Clone + Send + Sync + 'static,

Deletion in libpijul/src/tests/mod.rs at line 130 [5.289338]
B:BD[11.1783] → [8.31918:31957]
```
    T::Channel: Send + Sync + 'static,
```
Insertion in libpijul/src/tests/mod.rs at line 141 [5.289338]
[2.22962]
[2.22962]
```
        0,
```

Replacement in libpijul/src/tests/add_file.rs at line 17 [5.454125]

B:BD[2.23139] → [2.23139:23199]

        txn.write().unwrap().add_file("dir/file").unwrap();

[2.23139]

[5.454600]

        txn.write().unwrap().add_file("dir/file", 0).unwrap();

Replacement in libpijul/src/tests/add_file.rs at line 23 [5.454125]

B:BD[5.454793] → [2.23364:23433]

        assert!(txn.write().unwrap().add_file("dir/file").is_err());

[5.454793]

[2.23433]

        assert!(txn.write().unwrap().add_file("dir/file", 0).is_err());

Replacement in libpijul/src/tests/add_file.rs at line 76 [5.454125]
∅:D[8.36098] → [5.456639:456669]
B:BD[5.456639] → [5.456639:456669]
```
    txn.add_dir("dir/file")?;
```
[8.36098]
[12.30866]
```
    txn.add_dir("dir/file", 0)?;
```
Replacement in libpijul/src/tests/add_file.rs at line 108 [5.454125]
∅:D[2.23827] → [8.36305:36365]
B:BD[8.36305] → [8.36305:36365]
```
        txn.write().unwrap().add_file("dir/file").unwrap();
```
[2.23827]
[2.23828]
```
        txn.write().unwrap().add_file("dir/file", 0).unwrap();
```

Replacement in libpijul/src/tests/add_file.rs at line 145 [5.454125]

B:BD[5.458708] → [8.37197:37258]

        txn.write().unwrap().add_file("dir2/file").unwrap();

[5.458708]

[8.37258]

        txn.write().unwrap().add_file("dir2/file", 0).unwrap();

Replacement in libpijul/src/tests/add_file.rs at line 175 [5.454125]
∅:D[2.24243] → [8.37790:37839]
B:BD[8.37790] → [8.37790:37839]
```
    txn.write().unwrap().add_file("a/b/c/d/e")?;
```
[2.24243]
[2.24244]
```
    txn.write().unwrap().add_file("a/b/c/d/e", 0)?;
```
Insertion in libpijul/src/tests/add_file.rs at line 213 [5.454125]
[8.38470]
[13.5546]
```
        0,
```
Replacement in libpijul/src/tests/add_file.rs at line 236 [5.454125]
∅:D[2.24909] → [8.38763:38811]
B:BD[8.38763] → [8.38763:38811]
```
    txn.write().unwrap().add_file("dir/file")?;
```
[2.24909]
[2.24910]
```
    txn.write().unwrap().add_file("dir/file", 0)?;
```
Replacement in libpijul/src/tests/add_file.rs at line 280 [5.454125]
∅:D[2.25510] → [8.39327:39375]
B:BD[8.39327] → [8.39327:39375]
```
    txn.write().unwrap().add_file("dir/file")?;
```
[2.25510]
[2.25511]
```
    txn.write().unwrap().add_file("dir/file", 0)?;
```
Replacement in libpijul/src/tests/add_file.rs at line 338 [5.454125]
B:BD[2.26704] → [2.26704:26754]
```
    txn_alice.write().unwrap().add_file("file")?;
```
[2.26704]
[5.462187]
```
    txn_alice.write().unwrap().add_file("file", 0)?;
```
Insertion in libpijul/src/tests/add_file.rs at line 379 [5.454125]
[2.27755]
[5.463058]
```
        0,
```
Insertion in libpijul/src/tests/add_file.rs at line 400 [5.454125]
[2.28074]
[5.463439]
```
        0,
```
Replacement in libpijul/src/tests/add_file.rs at line 422 [5.454125]
B:BD[2.28303] → [2.28303:28353]
```
    txn_alice.write().unwrap().add_file("file")?;
```
[2.28303]
[5.464214]
```
    txn_alice.write().unwrap().add_file("file", 0)?;
```

Replacement in libpijul/src/tests/add_file.rs at line 434 [5.454125]

B:BD[2.28665] → [2.28665:28777]

    txn_alice.write().unwrap().add_dir("dir")?;
    txn_alice.write().unwrap().move_file("file", "dir/file2")?;

[2.28665]

[5.464544]

    txn_alice.write().unwrap().add_dir("dir", 0)?;
    txn_alice
        .write()
        .unwrap()
        .move_file("file", "dir/file2", 0)?;

Insertion in libpijul/src/tests/add_file.rs at line 487 [5.454125]
[2.29892]
[5.465658]
```
        0,
```
Insertion in libpijul/src/tests/add_file.rs at line 506 [5.454125]
[2.30131]
[5.465942]
```
        0,
```
Insertion in libpijul/src/tests/add_file.rs at line 527 [5.454125]
[2.30354]
[5.466283]
```
        0,
```

Replacement in libpijul/src/tests/add_file.rs at line 547 [5.454125]

B:BD[2.30503] → [2.30503:30604]

    txn_alice.write().unwrap().add_file("file")?;
    txn_alice.write().unwrap().add_file("file2")?;

[2.30503]

[5.466931]

    txn_alice.write().unwrap().add_file("file", 0)?;
    txn_alice.write().unwrap().add_file("file2", 0)?;

Replacement in libpijul/src/tests/add_file.rs at line 558 [5.454125]

B:BD[2.30825] → [2.30825:30885]

    txn_alice.write().unwrap().move_file("file", "file2")?;

[2.30825]

[5.467118]

    txn_alice.write().unwrap().move_file("file", "file2", 0)?;

Replacement in libpijul/src/tests/add_file.rs at line 594 [5.454125]
B:BD[2.31246] → [2.31246:31293]
```
    txn_alice.write().unwrap().add_file("a")?;
```
[2.31246]
[5.468036]
```
    txn_alice.write().unwrap().add_file("a", 0)?;
```
Replacement in libpijul/src/tests/add_file.rs at line 605 [5.454125]
B:BD[5.468219] → [2.31520:31573]
```
    txn_alice.write().unwrap().move_file("a", "b")?;
```
[5.468219]
[5.468255]
```
    txn_alice.write().unwrap().move_file("a", "b", 0)?;
```
Replacement in libpijul/src/tests/add_file.rs at line 617 [5.454125]
B:BD[5.468470] → [2.31799:31852]
```
    txn_alice.write().unwrap().move_file("b", "a")?;
```
[5.468470]
[5.468506]
```
    txn_alice.write().unwrap().move_file("b", "a", 0)?;
```
Insertion in libpijul/src/tests/add_file.rs at line 647 [5.454125]
[2.32515]
[5.469226]
```
        0,
```
Insertion in libpijul/src/tests/add_file.rs at line 671 [5.454125]
[2.33032]
[5.469725]
```
        0,
```
Insertion in libpijul/src/tests/add_file.rs at line 689 [5.454125]
[2.33319]
[5.470076]
```
        0,
```
Insertion in libpijul/src/tests/add_file.rs at line 720 [5.454125]
[2.33897]
[5.470723]
```
            0,
```
Insertion in libpijul/src/tests/add_file.rs at line 741 [5.454125]
[2.34214]
[5.471231]
```
            0,
```
Insertion in libpijul/src/tests/add_file.rs at line 756 [5.454125]
[2.34324]
[5.471575]
```
            0,
```
Insertion in libpijul/src/tests/add_file.rs at line 771 [5.454125]
[2.34522]
[5.471939]
```
            0,
```
Insertion in libpijul/src/tests/add_file.rs at line 800 [5.454125]
[2.35013]
[5.472493]
```
            0,
```
Insertion in libpijul/src/tests/add_file.rs at line 824 [5.454125]
[2.35242]
[5.473105]
```
            0,
```
Insertion in libpijul/src/tests/add_file.rs at line 839 [5.454125]
[2.35328]
[5.473449]
```
            0,
```

Replacement in libpijul/src/tests/add_file.rs at line 860 [5.454125]

B:BD[2.35477] → [2.35477:35586]

    txn_alice.write().unwrap().add_file("dir/file")?;
    txn_alice.write().unwrap().add_file("dir/file2")?;

[2.35477]

[5.474200]

    txn_alice.write().unwrap().add_file("dir/file", 0)?;
    txn_alice.write().unwrap().add_file("dir/file2", 0)?;

Replacement in libpijul/src/tests/add_file.rs at line 880 [5.454125]
B:BD[2.35948] → [2.35948:35994]
```
        .move_file("dir/file", "dir2/file")?;
```
[2.35948]
[2.35994]
```
        .move_file("dir/file", "dir2/file", 0)?;
```
Replacement in libpijul/src/tests/add_file.rs at line 884 [5.454125]
B:BD[2.36043] → [2.36043:36091]
```
        .move_file("dir/file2", "dir2/file2")?;
```
[2.36043]
[5.474724]
```
        .move_file("dir/file2", "dir2/file2", 0)?;
```
Insertion in libpijul/src/tests/add_file.rs at line 904 [5.454125]
[2.36411]
[5.475068]
```
        0,
```
Replacement in libpijul/src/tests/add_file.rs at line 913 [5.454125]
B:BD[2.36539] → [2.36539:36583]
```
        .move_file("dir2/file", "dir/file")
```
[2.36539]
[2.36583]
```
        .move_file("dir2/file", "dir/file", 0)
```
Replacement in libpijul/src/tests/add_file.rs at line 918 [5.454125]
B:BD[2.36656] → [2.36656:36702]
```
        .move_file("dir2/file2", "dir/file2")
```
[2.36656]
[2.36702]
```
        .move_file("dir2/file2", "dir/file2", 0)
```
Replacement in libpijul/src/tests/add_file.rs at line 1002 [5.454125]
∅:D[2.37467] → [8.40013:40068]
B:BD[8.40013] → [8.40013:40068]
```
    txn.write().unwrap().add_file("filedir").unwrap();
```
[2.37467]
[5.477412]
```
    txn.write().unwrap().add_file("filedir", 0).unwrap();
```

Replacement in libpijul/src/tests/add_file.rs at line 1011 [5.454125]

B:BD[5.477664] → [8.40154:40214]

    txn.write().unwrap().add_file("filedir/file").unwrap();

[5.477664]

[2.37658]

    txn.write().unwrap().add_file("filedir/file", 0).unwrap();

Replacement in libpijul/src/tests/add_file.rs at line 1028 [5.454125]
∅:D[2.37946] → [8.40267:40319]
B:BD[8.40267] → [8.40267:40319]
```
        txn.write().unwrap().add_file("dir/file")?;
```
[2.37946]
[2.37947]
```
        txn.write().unwrap().add_file("dir/file", 0)?;
```
Replacement in libpijul/src/tests/add_file.rs at line 1087 [5.454125]
B:BD[5.480210] → [8.40783:40827]
```
    txn.write().unwrap().add_file("file")?;
```
[5.480210]
[2.39246]
```
    txn.write().unwrap().add_file("file", 0)?;
```

Fixing more tests

Dependencies

In channels

Change contents

Replacement in libpijul/src/tests/text.rs at line 12 [2.10]

Replacement in libpijul/src/tests/text.rs at line 16 [2.10]

Replacement in libpijul/src/tests/text.rs at line 21 [2.10]

Replacement in libpijul/src/tests/text.rs at line 56 [2.10]

Replacement in libpijul/src/tests/text.rs at line 60 [2.10]

Replacement in libpijul/src/tests/text.rs at line 65 [2.10]

Replacement in libpijul/src/tests/text.rs at line 73 [2.10]

Deletion in libpijul/src/tests/mod.rs at line 23 [5.289338]

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

Replacement in libpijul/src/tests/mod.rs at line 27 [5.289338]

Deletion in libpijul/src/tests/mod.rs at line 33 [5.289338]

Solving an order conflict in libpijul/src/tests/mod.rs at line 33 [5.289338]

Resurrecting zombie bytes in "libpijul/src/tests/mod.rs" at line 94 [5.289338]

Solving an order conflict in libpijul/src/tests/mod.rs at line 94 [5.289338]

Replacement in libpijul/src/tests/mod.rs at line 98 [5.289338]

Replacement in libpijul/src/tests/mod.rs at line 100 [5.289338]

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

Deletion in libpijul/src/tests/mod.rs at line 110 [5.289338]

Resurrecting zombie bytes in "libpijul/src/tests/mod.rs" at line 110 [5.289338]

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

Deletion in libpijul/src/tests/mod.rs at line 130 [5.289338]

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

Replacement in libpijul/src/tests/add_file.rs at line 17 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 23 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 76 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 108 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 145 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 175 [5.454125]

Insertion in libpijul/src/tests/add_file.rs at line 213 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 236 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 280 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 338 [5.454125]

Insertion in libpijul/src/tests/add_file.rs at line 379 [5.454125]

Insertion in libpijul/src/tests/add_file.rs at line 400 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 422 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 434 [5.454125]

Insertion in libpijul/src/tests/add_file.rs at line 487 [5.454125]

Insertion in libpijul/src/tests/add_file.rs at line 506 [5.454125]

Insertion in libpijul/src/tests/add_file.rs at line 527 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 547 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 558 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 594 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 605 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 617 [5.454125]

Insertion in libpijul/src/tests/add_file.rs at line 647 [5.454125]

Insertion in libpijul/src/tests/add_file.rs at line 671 [5.454125]

Insertion in libpijul/src/tests/add_file.rs at line 689 [5.454125]

Insertion in libpijul/src/tests/add_file.rs at line 720 [5.454125]

Insertion in libpijul/src/tests/add_file.rs at line 741 [5.454125]

Insertion in libpijul/src/tests/add_file.rs at line 756 [5.454125]

Insertion in libpijul/src/tests/add_file.rs at line 771 [5.454125]

Insertion in libpijul/src/tests/add_file.rs at line 800 [5.454125]

Insertion in libpijul/src/tests/add_file.rs at line 824 [5.454125]

Insertion in libpijul/src/tests/add_file.rs at line 839 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 860 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 880 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 884 [5.454125]

Insertion in libpijul/src/tests/add_file.rs at line 904 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 913 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 918 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 1002 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 1011 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 1028 [5.454125]

Replacement in libpijul/src/tests/add_file.rs at line 1087 [5.454125]