Chasesomero/pijul - Change 4NEVLBWGDGBPVQZ33IIFBAZO7HWK54AD23LL5AZMDXI4MHKP546QC

Fixing some failing tests

Created by pmeunier on January 25, 2026

4NEVLBWGDGBPVQZ33IIFBAZO7HWK54AD23LL5AZMDXI4MHKP546QC

Dependencies

In channels

main

Change contents

Deletion in libpijul/src/working_copy/filesystem.rs at line 490 [5.208900]
B:BD[4.1768] → [4.1768:1810]
```
        let src = std::fs::metadata(&p)?;
```
Replacement in libpijul/src/tests/missing_context.rs at line 74 [5.291589]
B:BD[5.293696] → [2.328:376]
```
        repo_alice.remove_path("file", false)?;
```
[5.293696]
[5.293737]
```
        repo_alice.remove_path("file", false).unwrap();
```

Insertion in libpijul/src/tests/missing_context.rs at line 94 [5.291589]

[5.294266]

[6.13998]

    {
        let txn = txn_alice.read();
        let graph = channel_alice.read();
        let mut f = std::fs::File::create("alice0").unwrap();
        crate::pristine::debug(&*txn, &txn.graph(&*graph), &mut f).unwrap();
    }

Insertion in libpijul/src/tests/missing_context.rs at line 120 [5.291589]

[7.22756]

[6.14402]


    // panic!("{:?}", repo_alice.list_files());
    {
        let txn = txn_alice.read();
        let graph = channel_alice.read();
        let mut f = std::fs::File::create("alice1").unwrap();
        crate::pristine::debug(&*txn, &txn.graph(&*graph), &mut f).unwrap();
    }

Replacement in libpijul/src/tests/missing_context.rs at line 130 [5.291589]
B:BD[5.294358] → [5.294358:294403]
```
    repo_alice.read_file("file", &mut buf)?;
```
[5.294358]
[5.294403]
```
    repo_alice.read_file("file", &mut buf).unwrap();
```
Replacement in libpijul/src/tests/diff.rs at line 3 [8.162]
B:BD[8.205] → [8.205:244]
```
use rand::distributions::Alphanumeric;
```
[8.205]
[8.244]
```
use rand::distr::Alphanumeric;
```
Insertion in libpijul/src/tests/conflict.rs at line 1123 [5.357372]
[5.389412]
[5.389476]
```
    info!("resolving {:?}", std::time::SystemTime::now());
```
Deletion in libpijul/src/tests/conflict.rs at line 1134 [5.357372]
∅:D[7.61291] → [5.389752:389776]
B:BD[5.389752] → [5.389752:389776]
```
    info!("resolving");
```

Insertion in libpijul/src/tests/conflict.rs at line 1170 [5.357372]

[5.390813]


    crate::pristine::debug(
        &*txn.read(),
        &*channel_alice.read(),
        std::fs::File::create("alice.dot").unwrap(),
    )?;
    crate::pristine::debug(
        &*txn.read(),
        &*channel_bob.read(),
        std::fs::File::create("bob.dot").unwrap(),
    )?;

Insertion in libpijul/src/tests/conflict.rs at line 1242 [5.357372]
[5.392890]
[7.62456]
```
    debug!("apply Bob's change");
```

Insertion in libpijul/src/tests/conflict.rs at line 1244 [5.357372]

[7.62526]

[5.392963]

    crate::pristine::debug(
        &*txn.read(),
        &*channel_alice.read(),
        std::fs::File::create("alice.dot").unwrap(),
    )?;

Insertion in libpijul/src/tests/conflict.rs at line 1270 [5.357372]
[5.393580]
[5.393644]
```
    check_conflict(&buf)?;
```

Replacement in libpijul/src/record.rs at line 917 [5.488880]

B:BD[9.643] → [9.643:817]

        let channel_mod = if last_mod % 1000 == 0 {
            (txn.last_modified(channel) / 1000) * 1000
        } else {
            txn.last_modified(channel)
        };

[9.643]

[4.10453]

        let channel_mod = (txn.last_modified(channel) / 1000) * 1000;

Insertion in libpijul/src/diff/replace.rs at line 10 [5.779907]
[10.1]
[5.780322]
```
#[derive(Debug)]
```
Replacement in libpijul/src/diff/replace.rs at line 46 [5.779907]
B:BD[5.781307] → [11.85845:85846]
[5.781307]
[7.104580]
```
        debug!("up_context {:?}", up_context);
```
Insertion in libpijul/src/diff/replace.rs at line 86 [5.779907]
[12.45]
[5.782161]
```
        debug!("change {:?}", change);
```
Insertion in libpijul/src/diff/replace.rs at line 131 [5.779907]
[5.783287]
[5.783346]
```
    debug!("get_up_context {:?}", old);
```

Insertion in libpijul/src/diff/replace.rs at line 147 [5.779907]

[5.783974]

[5.784105]

        debug!(
            "marker {:?}",
            diff.marker.get(&diff.pos_a[up_context_idx].pos)
        );

Insertion in libpijul/src/diff/replace.rs at line 167 [5.779907]

[3.488]

                debug!("{:?} {:?} {:?}", pos.0, offset, v_end);

Insertion in libpijul/src/diff/replace.rs at line 176 [5.779907]
[3.826]
[5.784608]
```
                debug!("pos {:?}", pos.0 + offset);
```
Insertion in libpijul/src/diff/replace.rs at line 193 [5.779907]
[5.785425]
[5.785425]
```
                    debug!("up {:?}", pos);
```
Insertion in libpijul/src/diff/replace.rs at line 264 [5.779907]
[5.787932]
[5.787991]
```
    debug!("get down context");
```
Insertion in libpijul/src/diff/replace.rs at line 344 [5.779907]
[5.790996]
[5.790996]
```
    debug!("get_down_context_conflict");
```

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

[5.800749]

[5.800804]


// Position of the first byte in chunks[old].
//
// This assumes that all lines in `chunks` come from the same memory region.

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

[5.800980]

[5.801035]


// Total length (i.e. sum of lengths) in bytes of lines `&chunks[old...old+len]`.
//
// This assumes that all lines in `chunks` come from the same memory region.

Fixing some failing tests

Dependencies

In channels

Change contents

Deletion in libpijul/src/working_copy/filesystem.rs at line 490 [5.208900]

Replacement in libpijul/src/tests/missing_context.rs at line 74 [5.291589]

Insertion in libpijul/src/tests/missing_context.rs at line 94 [5.291589]

Insertion in libpijul/src/tests/missing_context.rs at line 120 [5.291589]

Replacement in libpijul/src/tests/missing_context.rs at line 130 [5.291589]

Replacement in libpijul/src/tests/diff.rs at line 3 [8.162]

Insertion in libpijul/src/tests/conflict.rs at line 1123 [5.357372]

Deletion in libpijul/src/tests/conflict.rs at line 1134 [5.357372]

Insertion in libpijul/src/tests/conflict.rs at line 1170 [5.357372]

Insertion in libpijul/src/tests/conflict.rs at line 1242 [5.357372]

Insertion in libpijul/src/tests/conflict.rs at line 1244 [5.357372]

Insertion in libpijul/src/tests/conflict.rs at line 1270 [5.357372]

Replacement in libpijul/src/record.rs at line 917 [5.488880]

Insertion in libpijul/src/diff/replace.rs at line 10 [5.779907]

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

Insertion in libpijul/src/diff/replace.rs at line 86 [5.779907]

Insertion in libpijul/src/diff/replace.rs at line 131 [5.779907]

Insertion in libpijul/src/diff/replace.rs at line 147 [5.779907]

Insertion in libpijul/src/diff/replace.rs at line 167 [5.779907]

Insertion in libpijul/src/diff/replace.rs at line 176 [5.779907]

Insertion in libpijul/src/diff/replace.rs at line 193 [5.779907]

Insertion in libpijul/src/diff/replace.rs at line 264 [5.779907]

Insertion in libpijul/src/diff/replace.rs at line 344 [5.779907]

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

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