jcdickinson/pijul - Change HOTQHK5URWTJ4IBMSWYPZQOPHA2ZQSPQAN5MAKGUDUAC6LZRDKOQC

Fixing tests

Created by pmeunier on October 22, 2021

HOTQHK5URWTJ4IBMSWYPZQOPHA2ZQSPQAN5MAKGUDUAC6LZRDKOQC

Dependencies

In channels

main

Change contents

Replacement in "libpijul/src/tests/unrecord.rs" at line 590 [3.248807]
B:BD[3.269402] → [3.269402:269433]
```
    let p_inv = p_del.inverse(
```
[3.269402]
[3.269433]
```
    let mut p_inv = p_del.inverse(
```

Replacement in "libpijul/src/tests/unrecord.rs" at line 600 [3.248807]

B:BD[3.269673] → [3.269673:269719]

    let h_inv = changes.save_change(&p_inv)?;

[3.269673]

[4.9215]

    let h_inv = changes.save_change(&mut p_inv, |_, _| Ok::<_, anyhow::Error>(()))?;

Replacement in "libpijul/src/tests/unrecord.rs" at line 741 [3.248807]
B:BD[3.275017] → [3.275017:275048]
```
        let p_inv = p.inverse(
```
[3.275017]
[3.275048]
```
        let mut p_inv = p.inverse(
```

Replacement in "libpijul/src/tests/unrecord.rs" at line 751 [3.248807]

B:BD[3.275320] → [3.275320:275378]

        let h_inv = changes.save_change(&p_inv).unwrap();

[3.275320]

[3.275378]

        let h_inv = changes
            .save_change(&mut p_inv, |_, _| Ok::<_, anyhow::Error>(()))
            .unwrap();

Replacement in "libpijul/src/tests/rollback.rs" at line 60 [5.14]

B:BD[5.2102] → [5.2102:2162]

    let p_inv = changes.get_change(&resb).unwrap().inverse(

[5.2102]

[5.2162]

    let mut p_inv = changes.get_change(&resb).unwrap().inverse(

Replacement in "libpijul/src/tests/rollback.rs" at line 70 [5.14]

B:BD[5.2401] → [6.23594:23648]

    let h_inv = changes.save_change(&p_inv).unwrap();

[5.2401]

[4.13692]

    let h_inv = changes
        .save_change(&mut p_inv, |_, _| Ok::<_, anyhow::Error>(()))
        .unwrap();

Replacement in "libpijul/src/tests/rollback.rs" at line 127 [5.14]

B:BD[5.4617] → [5.4617:4677]

    let p_inv = changes.get_change(&resb).unwrap().inverse(

[5.4617]

[5.4677]

    let mut p_inv = changes.get_change(&resb).unwrap().inverse(

Replacement in "libpijul/src/tests/rollback.rs" at line 137 [5.14]

B:BD[5.4916] → [5.4916:4962]

    let h_inv = changes.save_change(&p_inv)?;

[5.4916]

[4.14684]

    let h_inv = changes.save_change(&mut p_inv, |_, _| Ok::<_, anyhow::Error>(()))?;

Insertion in "libpijul/src/tests/mod.rs" at line 42 [3.289338]
[7.28285]
[8.22279]
```
        &crate::DEFAULT_SEPARATOR,
```

Replacement in "libpijul/src/tests/mod.rs" at line 56 [3.289338]

B:BD[3.290193] → [3.290193:290247]

    let change0 = crate::change::Change::make_change(

[3.290193]

[4.20212]

    let mut change0 = crate::change::Change::make_change(

Replacement in "libpijul/src/tests/mod.rs" at line 73 [3.289338]
∅:D[7.28444] → [3.290731:290776]
B:BD[3.290731] → [3.290731:290776]
```
    let hash = store.save_change(&change0)?;
```
[7.28444]
[3.290776]
```
    let hash = store.save_change(&mut change0, |_, _| Ok::<_, anyhow::Error>(()))?;
```
Replacement in "libpijul/src/tests/missing_context.rs" at line 266 [3.291589]
B:BD[3.299662] → [3.299662:299696]
```
    let inv = bob_change.inverse(
```
[3.299662]
[3.299696]
```
    let mut inv = bob_change.inverse(
```

Replacement in "libpijul/src/tests/missing_context.rs" at line 276 [3.291589]

B:BD[3.299936] → [3.299936:299980]

    let inv_h = changes.save_change(&inv)?;

[3.299936]

[3.299980]

    let inv_h = changes.save_change(&mut inv, |_, _| Ok::<_, anyhow::Error>(()))?;

Insertion in "libpijul/src/tests/diff.rs" at line 78 [2.162]
[2.2829]
[2.2829]
```
            Inode::ROOT,
```
Insertion in "libpijul/src/tests/diff.rs" at line 83 [2.162]
[2.2935]
[2.2935]
```
            &crate::DEFAULT_SEPARATOR,
```
Insertion in "libpijul/src/tests/conflict.rs" at line 1186 [3.357372]
[3.393790]
[4.62641]
```
                &crate::DEFAULT_SEPARATOR,
```
Replacement in "libpijul/src/tests/change.rs" at line 11 [3.446445]
∅:D[4.83328] → [3.446584:446649]
B:BD[3.446584] → [3.446584:446649]
```
fn hash_mismatch(change: &Change) -> Result<(), anyhow::Error> {
```
[4.83328]
[3.446649]
```
fn hash_mismatch(change: &mut Change) -> Result<(), anyhow::Error> {
```

Replacement in "libpijul/src/tests/change.rs" at line 15 [3.446445]

B:BD[3.446768] → [3.446768:446813]

    let mut h = change.serialize(&mut buf)?;

[3.446768]

[3.446813]

    let mut h = change.serialize(&mut buf, |_, _| Ok::<_, anyhow::Error>(()))?;

Insertion in "libpijul/src/tests/change.rs" at line 51 [3.446445]
[3.448033]
[4.83597]
```
            &crate::DEFAULT_SEPARATOR,
```
Replacement in "libpijul/src/tests/change.rs" at line 66 [3.446445]
B:BD[3.448343] → [3.448343:448397]
```
    let change0 = crate::change::Change::make_change(
```
[3.448343]
[4.83720]
```
    let mut change0 = crate::change::Change::make_change(
```
Replacement in "libpijul/src/tests/change.rs" at line 80 [3.446445]
∅:D[7.29876] → [3.448688:448734]
B:BD[3.448688] → [3.448688:448734]
```
    let hash0 = store.save_change(&change0)?;
```
[7.29876]
[4.83795]
```
    let hash0 = store.save_change(&mut change0, |_, _| Ok::<_, anyhow::Error>(()))?;
```
Replacement in "libpijul/src/tests/change.rs" at line 89 [3.446445]
B:BD[3.448825] → [3.448825:448855]
```
    hash_mismatch(&change0)?;
```
[3.448825]
[3.448899]
```
    hash_mismatch(&mut change0)?;
```

Replacement in "libpijul/src/tests/add_file.rs" at line 57 [3.454125]

∅:D[7.30810] → [3.456088:456129]

B:BD[3.456088] → [3.456088:456129]

        assert_eq!(key, Position::ROOT);

[7.30810]

[3.456129]

        let key_ = get_inode_vertex(&txn, &channel.graph, Position::ROOT)?;
        assert_eq!(key, key_);

Deletion in "libpijul/src/tests/add_file.rs" at line 208 [3.454125]
∅:D[9.25938] → [3.459869:459870]
∅:D[10.32002] → [3.459869:459870]
∅:D[11.39048] → [3.459869:459870]
∅:D[4.88016] → [3.459869:459870]
B:BD[3.459869] → [3.459869:459870]
Insertion in "libpijul/src/tests/add_file.rs" at line 463 [3.454125]
[3.469508]
[3.469572]
Insertion in "libpijul/src/tests/add_file.rs" at line 667 [3.454125]
[3.475569]
[8.36755]
```
        &crate::DEFAULT_SEPARATOR,
```
Insertion in "libpijul/src/tests/add_file.rs" at line 678 [3.454125]
[3.475762]
[8.36849]
```
        &crate::DEFAULT_SEPARATOR,
```
Replacement in "libpijul/src/tests/add_file.rs" at line 692 [3.454125]
B:BD[3.476009] → [3.476009:476062]
```
    let alice2 = crate::change::Change::make_change(
```
[3.476009]
[4.94242]
```
    let mut alice2 = crate::change::Change::make_change(
```
Replacement in "libpijul/src/tests/add_file.rs" at line 706 [3.454125]
∅:D[7.31627] → [3.476352:476402]
B:BD[3.476352] → [3.476352:476402]
```
    let h_alice2 = changes.save_change(&alice2)?;
```
[7.31627]
[3.476402]
```
    let h_alice2 = changes.save_change(&mut alice2, |_, _| Ok::<_, anyhow::Error>(()))?;
```

Insertion in "libpijul/src/tests/add_file.rs" at line 828 [3.454125]

[3.480455]


/// Add a simple file, to test submodules.
#[test]
fn add_file2_test() -> Result<(), anyhow::Error> {
    env_logger::try_init().unwrap_or(());
    let repo = working_copy::memory::Memory::new();
    let changes = changestore::memory::Memory::new();
    repo.add_file("a/b/c/file", b"a\nb\nc\nd\ne\nf\n".to_vec());
    let env = pristine::sanakirja::Pristine::new_anon()?;
    {
        let txn = env.arc_txn_begin().unwrap();
        txn.write().add_file("a/b/c/file", 0).unwrap();
        let channel = txn.write().open_or_create_channel("main").unwrap();
        record_all(&repo, &changes, &txn, &channel, "").unwrap();
        txn.commit().unwrap()
    }
    let repo2 = working_copy::memory::Memory::new();
    repo2.add_file("a/b/c/file", b"w\nx\ny\nz\n".to_vec());
    let change = {
        let txn = env.arc_txn_begin().unwrap();
        txn.write().add_file("a/b/c/file", 0).unwrap();
        let channel = txn.write().open_or_create_channel("other").unwrap();
        let change = record_all(&repo, &changes, &txn, &channel, "").unwrap();
        txn.commit().unwrap();
        change
    };
    let txn = env.arc_txn_begin().unwrap();
    let channel = txn.write().open_or_create_channel("main").unwrap();
    apply::apply_change(&changes, &mut *txn.write(), &mut *channel.write(), &change)?;
    output::output_repository_no_pending(&repo, &changes, &txn, &channel, "", true, None, 1, 0)?;
    Ok(())
}

Insertion in "libpijul/src/alive/dfs.rs" at line 89 [3.1000429]
[3.1002747]
[3.1002747]
```
                extra: Vec::new(),
```

Fixing tests

Dependencies

In channels

Change contents

Replacement in "libpijul/src/tests/unrecord.rs" at line 590 [3.248807]

Replacement in "libpijul/src/tests/unrecord.rs" at line 600 [3.248807]

Replacement in "libpijul/src/tests/unrecord.rs" at line 741 [3.248807]

Replacement in "libpijul/src/tests/unrecord.rs" at line 751 [3.248807]

Replacement in "libpijul/src/tests/rollback.rs" at line 60 [5.14]

Replacement in "libpijul/src/tests/rollback.rs" at line 70 [5.14]

Replacement in "libpijul/src/tests/rollback.rs" at line 127 [5.14]

Replacement in "libpijul/src/tests/rollback.rs" at line 137 [5.14]

Insertion in "libpijul/src/tests/mod.rs" at line 42 [3.289338]

Replacement in "libpijul/src/tests/mod.rs" at line 56 [3.289338]

Replacement in "libpijul/src/tests/mod.rs" at line 73 [3.289338]

Replacement in "libpijul/src/tests/missing_context.rs" at line 266 [3.291589]

Replacement in "libpijul/src/tests/missing_context.rs" at line 276 [3.291589]

Insertion in "libpijul/src/tests/diff.rs" at line 78 [2.162]

Insertion in "libpijul/src/tests/diff.rs" at line 83 [2.162]

Insertion in "libpijul/src/tests/conflict.rs" at line 1186 [3.357372]

Replacement in "libpijul/src/tests/change.rs" at line 11 [3.446445]

Replacement in "libpijul/src/tests/change.rs" at line 15 [3.446445]

Insertion in "libpijul/src/tests/change.rs" at line 51 [3.446445]

Replacement in "libpijul/src/tests/change.rs" at line 66 [3.446445]

Replacement in "libpijul/src/tests/change.rs" at line 80 [3.446445]

Replacement in "libpijul/src/tests/change.rs" at line 89 [3.446445]

Replacement in "libpijul/src/tests/add_file.rs" at line 57 [3.454125]

Deletion in "libpijul/src/tests/add_file.rs" at line 208 [3.454125]

Insertion in "libpijul/src/tests/add_file.rs" at line 463 [3.454125]

Insertion in "libpijul/src/tests/add_file.rs" at line 667 [3.454125]

Insertion in "libpijul/src/tests/add_file.rs" at line 678 [3.454125]

Replacement in "libpijul/src/tests/add_file.rs" at line 692 [3.454125]

Replacement in "libpijul/src/tests/add_file.rs" at line 706 [3.454125]

Insertion in "libpijul/src/tests/add_file.rs" at line 828 [3.454125]

Insertion in "libpijul/src/alive/dfs.rs" at line 89 [3.1000429]