Chasesomero/pijul - Change 7FP2DFNXGKH2GQIH35BAIHMRORXERI6ARZGVVN7LZKMUYIADIULAC

Optimisation: avoid re-checking the entire repo when recording after an unrecord

This is starting to get annoying on large repos or repos with large files

Created by pmeunier on December 26, 2025

7FP2DFNXGKH2GQIH35BAIHMRORXERI6ARZGVVN7LZKMUYIADIULAC

Dependencies

In channels

main

Change contents

Insertion in pijul-remote/src/lib.rs at line 1048 [12.52474]

[10.835]

[11.21]

                let mut working_copy =
                    libpijul::working_copy::filesystem::FileSystem::from_root(&l.root);

Replacement in pijul-remote/src/lib.rs at line 1057 [12.52474]

B:BD[13.227] → [13.227:323]

                    txn.archive_with_state(&changes, &channel, &state, extra, &mut tarball, 0)?

[13.227]

[12.61504]

                    txn.archive_with_state(
                        &changes,
                        &channel,
                        &state,
                        extra,
                        &mut tarball,
                        0,
                        &mut working_copy,
                    )?

Replacement in pijul/src/commands/unrecord.rs at line 128 [12.95630]

B:BD[14.998] → [15.2116:2186]

            txn.write().unrecord(&repo.changes, &channel, &hash, 0)?;

[14.998]

[16.5477]

            txn.write()
                .unrecord(&repo.changes, &channel, &hash, 0, &repo.working_copy)?;

Replacement in pijul/src/commands/unrecord.rs at line 146 [12.95630]

B:BD[16.5939] → [15.2273:2340]

            txn.write().unrecord(&repo.changes, &channel, &h, 0)?;

[16.5939]

[6.0]

            txn.write()
                .unrecord(&repo.changes, &channel, &h, 0, &repo.working_copy)?;

Insertion in pijul/src/commands/record.rs at line 123 [12.101759]
[8.1524]
[17.501]
```
                &repo.working_copy,
```

Replacement in pijul/src/commands/pushpull.rs at line 745 [12.111631]

B:BD[2.40] → [2.40:114]

                txn.write().unrecord(&repo.changes, &mut channel, h, 0)?;

[2.40]

[2.114]

                txn.write()
                    .unrecord(&repo.changes, &mut channel, h, 0, &repo.working_copy)?;

Replacement in pijul/src/commands/pushpull.rs at line 892 [12.111631]

B:BD[12.120988] → [15.11296:11367]

            txn.write().unrecord(&repo.changes, &mut channel, &h, 0)?;

[12.120988]

[12.121048]

            txn.write()
                .unrecord(&repo.changes, &mut channel, &h, 0, &repo.working_copy)?;

Insertion in pijul/src/commands/protocol.rs at line 312 [12.123281]
[18.826]
[12.132573]
```
                            &repo.working_copy,
```

Replacement in pijul/src/commands/fork.rs at line 57 [12.167873]

B:BD[19.1912] → [19.1912:1988]

                            txn.unrecord(&repo.changes, &mut fork, &h, 0)?;

[19.1912]

[19.1988]

                            txn.unrecord(&repo.changes, &mut fork, &h, 0, &repo.working_copy)?;

Insertion in pijul/src/commands/archive.rs at line 120 [12.191083]
[18.1652]
[12.193775]
```
                    &repo.working_copy,
```

Insertion in libpijul/src/working_copy/mod.rs at line 50 [12.198172]

[20.135]

[5.94]


    fn touch(&self, _name: &str, time: std::time::SystemTime) -> Result<(), Self::Error> {
        Ok(())
    }

Insertion in libpijul/src/working_copy/memory.rs at line 332 [12.199222]

[21.1007]

[12.208875]

    }
    fn touch(&self, file: &str, time: std::time::SystemTime) -> Result<(), Self::Error> {
        let mut m = self.0.lock();
        if let Some(f) = m.get_file_mut(file) {
            if let Inode::File {
                ref mut last_modified,
                ..
            } = f
            {
                *last_modified = time
            } else {
                unreachable!()
            }
        }
        Ok(())

Insertion in libpijul/src/working_copy/filesystem.rs at line 487 [12.208900]

[12.216924]


    fn touch(&self, file: &str, time: std::time::SystemTime) -> Result<(), Self::Error> {
        let p = self.path(file);
        let src = std::fs::metadata(&p)?;
        let dest = std::fs::File::open(&p)?;
        let times = std::fs::FileTimes::new().set_modified(time);
        dest.set_times(times)?;
        Ok(())
    }

Insertion in libpijul/src/unrecord/working_copy.rs at line 5 [12.225940]
[12.226097]
[22.0]
```
use crate::working_copy::WorkingCopy;
```

Replacement in libpijul/src/unrecord/working_copy.rs at line 24 [12.225940]

B:BD[22.3] → [23.8900:8984]

pub fn undo_file_deletion<T: ChannelTxnT + TreeMutTxnT + TreeTxnT, P: ChangeStore>(

[22.3]

[12.226784]

pub fn undo_file_deletion<
    T: ChannelTxnT + TreeMutTxnT + TreeTxnT,
    P: ChangeStore,
    W: crate::working_copy::WorkingCopy,
>(

Replacement in libpijul/src/unrecord/working_copy.rs at line 35 [12.225940]
B:BD[18.2060] → [23.8985:9038]
```
) -> Result<(), super::UnrecordError<P::Error, T>> {
```
[18.2060]
[12.226940]
```
) -> Result<(), super::UnrecordError<P::Error, W::Error, T>> {
```

Replacement in libpijul/src/unrecord/working_copy.rs at line 42 [12.225940]

B:BD[24.6696] → [18.2061:2125]

            restore(txn, changes, channel, source, dest, salt)?

[24.6696]

[12.227344]

            restore::<_, _, W>(txn, changes, channel, source, dest, salt)?

Replacement in libpijul/src/unrecord/working_copy.rs at line 48 [12.225940]

B:BD[22.5] → [23.9039:9108]

fn restore<T: ChannelTxnT + TreeMutTxnT + TreeTxnT, P: ChangeStore>(

[22.5]

[12.227468]

fn restore<T: ChannelTxnT + TreeMutTxnT + TreeTxnT, P: ChangeStore, W: WorkingCopy>(

Replacement in libpijul/src/unrecord/working_copy.rs at line 55 [12.225940]
B:BD[18.2141] → [23.9109:9162]
```
) -> Result<(), super::UnrecordError<P::Error, T>> {
```
[18.2141]
[12.227621]
```
) -> Result<(), super::UnrecordError<P::Error, W::Error, T>> {
```

Replacement in libpijul/src/unrecord/working_copy.rs at line 62 [12.225940]

B:BD[25.92] → [18.2142:2237]

                return_value = restore_inode(txn, changes, source, dest, parent_inode, salt)?;

[25.92]

[25.181]

                return_value =
                    restore_inode::<_, _, W>(txn, changes, source, dest, parent_inode, salt)?;

Replacement in libpijul/src/unrecord/working_copy.rs at line 86 [12.225940]

B:BD[12.228382] → [18.2238:2328]

            return_value = restore_inode(txn, changes, source, dest, Inode::ROOT, salt)?;

[12.228382]

[26.14972]

            return_value = restore_inode::<_, _, W>(txn, changes, source, dest, Inode::ROOT, salt)?;

Replacement in libpijul/src/unrecord/working_copy.rs at line 88 [12.225940]

B:BD[26.15052] → [18.2329:2413]

            return_value = restore_inode(txn, changes, source, dest, inode, salt)?;

[26.15052]

[12.228631]

            return_value = restore_inode::<_, _, W>(txn, changes, source, dest, inode, salt)?;

Replacement in libpijul/src/unrecord/working_copy.rs at line 92 [12.225940]

B:BD[27.336] → [27.336:430]

                return_value = restore_inode(txn, changes, source, dest, Inode::ROOT, salt)?;

[27.336]

[27.430]

                return_value =
                    restore_inode::<_, _, W>(txn, changes, source, dest, Inode::ROOT, salt)?;

Replacement in libpijul/src/unrecord/working_copy.rs at line 103 [12.225940]

B:BD[22.9] → [23.9163:9236]

fn restore_inode<T: TreeMutTxnT + GraphTxnT + TreeTxnT, P: ChangeStore>(

[22.9]

[12.228969]

fn restore_inode<T: TreeMutTxnT + GraphTxnT + TreeTxnT, P: ChangeStore, W: WorkingCopy>(

Replacement in libpijul/src/unrecord/working_copy.rs at line 110 [12.225940]

B:BD[18.2429] → [23.9237:9301]

) -> Result<Option<Inode>, super::UnrecordError<P::Error, T>> {

[18.2429]

[28.353]

) -> Result<Option<Inode>, super::UnrecordError<P::Error, W::Error, T>> {

Insertion in libpijul/src/unrecord/working_copy.rs at line 188 [12.225940]
[29.21979]
[29.21979]
```
    W: WorkingCopy,
```
Replacement in libpijul/src/unrecord/working_copy.rs at line 193 [12.225940]
B:BD[12.230916] → [23.9302:9355]
```
) -> Result<(), super::UnrecordError<P::Error, T>> {
```
[12.230916]
[12.230949]
```
) -> Result<(), super::UnrecordError<P::Error, W::Error, T>> {
```
Replacement in libpijul/src/unrecord/mod.rs at line 5 [12.231493]
B:BD[12.231689] → [12.231689:231690]
[12.231671]
[12.231690]
```
use crate::working_copy::WorkingCopy;
```

Replacement in libpijul/src/unrecord/mod.rs at line 11 [12.231493]

B:BD[23.9373] → [23.9373:9470]

pub enum UnrecordError<ChangestoreError: std::error::Error + 'static, T: GraphTxnT + TreeTxnT> {

[23.9373]

[30.7820]

pub enum UnrecordError<
    ChangestoreError: std::error::Error + 'static,
    WorkingCopyError: std::error::Error + 'static,
    T: GraphTxnT + TreeTxnT,
> {

Insertion in libpijul/src/unrecord/mod.rs at line 39 [12.231493]
[23.9928]
[29.22318]
```
    #[error(transparent)]
    WorkingCopy(WorkingCopyError),
```

Replacement in libpijul/src/unrecord/mod.rs at line 43 [12.231493]

B:BD[29.22321] → [23.9929:10023]

impl<C: std::error::Error, T: GraphTxnT + TreeTxnT> std::fmt::Debug for UnrecordError<C, T> {

[29.22321]

[23.10023]

impl<C: std::error::Error, W: std::error::Error, T: GraphTxnT + TreeTxnT> std::fmt::Debug
    for UnrecordError<C, W, T>
{

Insertion in libpijul/src/unrecord/mod.rs at line 68 [12.231493]

[23.11131]

            UnrecordError::WorkingCopy(e) => std::fmt::Debug::fmt(e, fmt),

Replacement in libpijul/src/unrecord/mod.rs at line 73 [12.231493]
∅:D[30.8614] → [12.231752:231797]
B:BD[12.231752] → [12.231752:231797]
```
pub fn unrecord<T: MutTxnT, P: ChangeStore>(
```
[30.8614]
[12.231797]
```
pub fn unrecord<T: MutTxnT, P: ChangeStore, W: WorkingCopy>(
```

Replacement in libpijul/src/unrecord/mod.rs at line 79 [12.231493]

B:BD[18.2521] → [23.11142:11190]

) -> Result<bool, UnrecordError<P::Error, T>> {

[18.2521]

[26.15913]

    working_copy: &W,
) -> Result<bool, UnrecordError<P::Error, W::Error, T>> {

Replacement in libpijul/src/unrecord/mod.rs at line 89 [12.231493]

B:BD[12.232195] → [30.8769:8833]

    del_channel_changes::<T, P>(txn, &mut channel, change_id)?;

[12.232195]

[12.232251]

    del_channel_changes::<T, P, W>(txn, &mut channel, change_id)?;

Replacement in libpijul/src/unrecord/mod.rs at line 95 [12.231493]

∅:D[4.99] → [18.2522:2590]

B:BD[12.232252] → [18.2522:2590]

    unapply(txn, &mut channel, changes, change_id, &change, salt)?;

[4.99]

[12.232314]

    unapply(
        txn,
        &mut channel,
        changes,
        change_id,
        &change,
        salt,
        working_copy,
    )?;

Insertion in libpijul/src/unrecord/mod.rs at line 123 [12.231493]
[29.23143]
[29.23143]
```
    W: WorkingCopy,
```
Replacement in libpijul/src/unrecord/mod.rs at line 128 [12.231493]
B:BD[12.232905] → [23.11279:11325]
```
) -> Result<(), UnrecordError<P::Error, T>> {
```
[12.232905]
[26.16307]
```
) -> Result<(), UnrecordError<P::Error, W::Error, T>> {
```
Insertion in libpijul/src/unrecord/mod.rs at line 179 [12.231493]
[29.23854]
[29.23854]
```
    W: WorkingCopy,
```

Replacement in libpijul/src/unrecord/mod.rs at line 187 [12.231493]

B:BD[18.2606] → [23.11326:11372]

) -> Result<(), UnrecordError<C::Error, T>> {

[18.2606]

[31.0]

    working_copy: &W,
) -> Result<(), UnrecordError<C::Error, W::Error, T>> {

Replacement in libpijul/src/unrecord/mod.rs at line 199 [12.231493]
B:BD[31.244] → [31.244:275]
```
                unapply_edges(
```
[31.244]
[31.275]
```
                unapply_edges::<_, _, W>(
```
Replacement in libpijul/src/unrecord/mod.rs at line 217 [12.231493]
B:BD[12.234880] → [32.1909:1952]
```
                unapply_newvertex::<T, C>(
```
[12.234880]
[32.1952]
```
                unapply_newvertex::<T, C, W>(
```

Replacement in libpijul/src/unrecord/mod.rs at line 233 [12.231493]

∅:D[31.737] → [32.2220:2308]

B:BD[33.2017] → [32.2220:2308]

            remove_zombies::<_, C>(txn, T::graph_mut(channel), &mut ws, change_id, n)?;

[31.737]

[12.235581]

            remove_zombies::<_, C, W>(txn, T::graph_mut(channel), &mut ws, change_id, n)?;

Replacement in libpijul/src/unrecord/mod.rs at line 242 [12.231493]

B:BD[34.372] → [35.723:777]

                    working_copy::undo_file_deletion(

[34.372]

[35.777]

                    working_copy::undo_file_deletion::<_, _, W>(

Replacement in libpijul/src/unrecord/mod.rs at line 246 [12.231493]

B:BD[34.653] → [34.653:744]

                    working_copy::undo_file_reinsertion::<C, _>(txn, change_id, newedges)?

[34.653]

[34.744]

                    working_copy::undo_file_reinsertion::<C, _, W>(txn, change_id, newedges)?

Replacement in libpijul/src/unrecord/mod.rs at line 261 [12.231493]
B:BD[31.839] → [31.839:873]
```
    for inode in touched_inodes {
```
[31.839]
[31.873]
```
    for inode in touched_inodes.iter() {
```
Replacement in libpijul/src/unrecord/mod.rs at line 264 [12.231493]
∅:D[36.1201] → [31.968:1034]
B:BD[31.968] → [31.968:1034]
```
        if let Ok(inode) = internal_pos(txn, &inode, change_id) {
```
[36.1201]
[31.1034]
```
        if let Ok(inode) = internal_pos(txn, inode, change_id) {
```

Replacement in libpijul/src/unrecord/mod.rs at line 305 [12.231493]

B:BD[32.2573] → [37.884:925]

    txn.touch_channel(channel, Some(0));

[32.2573]

[7.409]


    let now = std::time::SystemTime::now();
    for inode in touched_inodes.iter() {
        if let Ok(inode) = internal_pos(txn, inode, change_id) {
            if let Some(inode) = txn.get_revinodes(&inode, None)? {
                if let Some(name) = crate::fs::inode_filename(txn, *inode)? {
                    debug!(
                        "touching file {:?} {:?}",
                        name,
                        now.duration_since(std::time::SystemTime::UNIX_EPOCH)
                            .unwrap()
                            .as_millis()
                    );
                    working_copy
                        .touch(&name, now)
                        .map_err(UnrecordError::WorkingCopy)?
                }
            }
        }
    }

Replacement in libpijul/src/unrecord/mod.rs at line 342 [12.231493]

B:BD[12.235980] → [23.11373:11439]

fn unapply_newvertex<T: GraphMutTxnT + TreeTxnT, C: ChangeStore>(

[12.235980]

[12.236239]

fn unapply_newvertex<T: GraphMutTxnT + TreeTxnT, C: ChangeStore, W: WorkingCopy>(

Replacement in libpijul/src/unrecord/mod.rs at line 348 [12.231493]
B:BD[12.236377] → [23.11440:11486]
```
) -> Result<(), UnrecordError<C::Error, T>> {
```
[12.236377]
[12.236410]
```
) -> Result<(), UnrecordError<C::Error, W::Error, T>> {
```

Replacement in libpijul/src/unrecord/mod.rs at line 378 [12.231493]

B:BD[12.238115] → [38.990:1045]

        ws.perform_del::<C, T>(txn, channel, vertex)?;

[12.238115]

[38.1045]

        ws.perform_del::<C, T, W>(txn, channel, vertex)?;

Replacement in libpijul/src/unrecord/mod.rs at line 387 [12.231493]

B:BD[38.1166] → [23.11487:11551]

    fn perform_del<C: ChangeStore, T: GraphMutTxnT + TreeTxnT>(

[38.1166]

[38.1214]

    fn perform_del<C: ChangeStore, T: GraphMutTxnT + TreeTxnT, W: WorkingCopy>(

Replacement in libpijul/src/unrecord/mod.rs at line 392 [12.231493]
B:BD[38.1322] → [23.11552:11602]
```
    ) -> Result<(), UnrecordError<C::Error, T>> {
```
[38.1322]
[38.1379]
```
    ) -> Result<(), UnrecordError<C::Error, W::Error, T>> {
```

Replacement in libpijul/src/unrecord/mod.rs at line 413 [12.231493]

B:BD[30.10239] → [23.11725:11787]

fn unapply_edges<T: GraphMutTxnT + TreeTxnT, P: ChangeStore>(

[12.239447]

[12.240406]

fn unapply_edges<T: GraphMutTxnT + TreeTxnT, P: ChangeStore, W: WorkingCopy>(

Replacement in libpijul/src/unrecord/mod.rs at line 420 [12.231493]
B:BD[12.240557] → [23.11788:11834]
```
) -> Result<(), UnrecordError<P::Error, T>> {
```
[12.240557]
[12.240590]
```
) -> Result<(), UnrecordError<P::Error, W::Error, T>> {
```
Replacement in libpijul/src/unrecord/mod.rs at line 446 [12.231493]
B:BD[39.569] → [35.1342:1375]
```
            if must_reintroduce(
```
[39.569]
[35.1375]
```
            if must_reintroduce::<_, _, W>(
```

Replacement in libpijul/src/unrecord/mod.rs at line 499 [12.231493]

B:BD[12.241975] → [23.11835:11897]

fn must_reintroduce<T: GraphTxnT + TreeTxnT, C: ChangeStore>(

[12.241975]

[12.242021]

fn must_reintroduce<T: GraphTxnT + TreeTxnT, C: ChangeStore, W: WorkingCopy>(

Replacement in libpijul/src/unrecord/mod.rs at line 508 [12.231493]
B:BD[38.1958] → [23.11898:11946]
```
) -> Result<bool, UnrecordError<C::Error, T>> {
```
[38.1958]
[12.242203]
```
) -> Result<bool, UnrecordError<C::Error, W::Error, T>> {
```

Replacement in libpijul/src/unrecord/mod.rs at line 539 [12.231493]

B:BD[12.243198] → [12.243198:243261]

    edge_is_in_channel(txn, changes, b_ext, intro, &mut stack)

[12.243198]

[12.243261]

    edge_is_in_channel::<_, _, W>(txn, changes, b_ext, intro, &mut stack)

Replacement in libpijul/src/unrecord/mod.rs at line 542 [12.231493]

B:BD[12.243264] → [23.11947:12011]

fn edge_is_in_channel<T: GraphTxnT + TreeTxnT, C: ChangeStore>(

[12.243264]

[12.243312]

fn edge_is_in_channel<T: GraphTxnT + TreeTxnT, C: ChangeStore, W: WorkingCopy>(

Replacement in libpijul/src/unrecord/mod.rs at line 548 [12.231493]
B:BD[12.243431] → [23.12012:12060]
```
) -> Result<bool, UnrecordError<C::Error, T>> {
```
[12.243431]
[12.243466]
```
) -> Result<bool, UnrecordError<C::Error, W::Error, T>> {
```
Replacement in libpijul/src/unrecord/mod.rs at line 571 [12.231493]
∅:D[7.1048] → [23.12061:12124]
B:BD[12.243938] → [23.12061:12124]
```
fn remove_zombies<T: GraphMutTxnT + TreeTxnT, C: ChangeStore>(
```
[7.1048]
[12.243969]
```
fn remove_zombies<T: GraphMutTxnT + TreeTxnT, C: ChangeStore, W: WorkingCopy>(
```
Replacement in libpijul/src/unrecord/mod.rs at line 577 [12.231493]
B:BD[12.244079] → [23.12125:12171]
```
) -> Result<(), UnrecordError<C::Error, T>> {
```
[12.244079]
[12.244208]
```
) -> Result<(), UnrecordError<C::Error, W::Error, T>> {
```

Replacement in libpijul/src/tests/unrecord.rs at line 30 [12.248807]

B:BD[40.1353] → [40.1353:1432]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h1, 0)?;

[40.1353]

[12.249770]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h1, 0, &repo)?;

Replacement in libpijul/src/tests/unrecord.rs at line 68 [12.248807]

B:BD[40.1907] → [40.1907:1986]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h1, 0)?;

[40.1907]

[12.251116]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h1, 0, &repo)?;

Replacement in libpijul/src/tests/unrecord.rs at line 106 [12.248807]

B:BD[12.252428] → [40.2451:2530]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h1, 0)?;

[12.252428]

[12.252499]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h1, 0, &repo)?;

Replacement in libpijul/src/tests/unrecord.rs at line 203 [12.248807]

B:BD[12.255738] → [40.4125:4204]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h2, 0)?;

[12.255738]

[12.255856]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h2, 0, &repo)?;

Replacement in libpijul/src/tests/unrecord.rs at line 259 [12.248807]

B:BD[12.257744] → [40.5018:5097]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h2, 0)?;

[12.257744]

[12.257815]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h2, 0, &repo)?;

Replacement in libpijul/src/tests/unrecord.rs at line 294 [12.248807]

B:BD[12.258960] → [40.5328:5409]

    crate::unrecord::unrecord(&mut *txn2.write(), &channel2, &changes, &h1, 0)?;

[12.258960]

[12.259082]

    crate::unrecord::unrecord(&mut *txn2.write(), &channel2, &changes, &h1, 0, &repo)?;

Replacement in libpijul/src/tests/unrecord.rs at line 331 [12.248807]

B:BD[12.260384] → [40.5987:6066]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h1, 0)?;

[12.260384]

[12.260549]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h1, 0, &repo)?;

Replacement in libpijul/src/tests/unrecord.rs at line 388 [12.248807]

B:BD[12.262135] → [40.6628:6713]

    match crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h0, 0) {

[12.262135]

[41.495]

    match crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h0, 0, &repo) {

Replacement in libpijul/src/tests/unrecord.rs at line 395 [12.248807]

B:BD[40.6811] → [40.6811:6897]

    match crate::unrecord::unrecord(&mut *txn.write(), &channel2, &changes, &h0, 0) {

[40.6811]

[41.575]

    match crate::unrecord::unrecord(&mut *txn.write(), &channel2, &changes, &h0, 0, &repo) {

Replacement in libpijul/src/tests/unrecord.rs at line 405 [12.248807]

B:BD[40.6991] → [40.6991:7070]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h1, 0)?;

[40.6991]

[12.263106]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h1, 0, &repo)?;

Replacement in libpijul/src/tests/unrecord.rs at line 412 [12.248807]

B:BD[40.7164] → [40.7164:7243]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h0, 0)?;

[40.7164]

[12.263373]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h0, 0, &repo)?;

Replacement in libpijul/src/tests/unrecord.rs at line 451 [12.248807]

B:BD[12.264448] → [40.7795:7873]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h, 0)?;

[12.264448]

[12.264562]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h, 0, &repo)?;

Replacement in libpijul/src/tests/unrecord.rs at line 462 [12.248807]

B:BD[12.264932] → [40.7938:8017]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h0, 0)?;

[12.264932]

[12.265047]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h0, 0, &repo)?;

Replacement in libpijul/src/tests/unrecord.rs at line 532 [12.248807]

B:BD[12.267354] → [40.8726:8808]

    crate::unrecord::unrecord(&mut *txn.write(), &mut channel, &changes, &c, 0)?;

[12.267354]

[12.267468]

    crate::unrecord::unrecord(&mut *txn.write(), &mut channel, &changes, &c, 0, &repo)?;

Replacement in libpijul/src/tests/unrecord.rs at line 622 [12.248807]

B:BD[12.270241] → [40.9344:9426]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h_inv, 0)?;

[12.270241]

[12.270315]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h_inv, 0, &repo)?;

Replacement in libpijul/src/tests/unrecord.rs at line 680 [12.248807]

B:BD[12.272403] → [40.10093:10172]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h2, 0)?;

[12.272403]

[12.272518]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h2, 0, &repo)?;

Replacement in libpijul/src/tests/unrecord.rs at line 736 [12.248807]

B:BD[12.274399] → [40.10847:10930]

    crate::unrecord::unrecord(&mut *txn.write(), &mut channel, &changes, &h2, 0)?;

[12.274399]

[12.274514]

    crate::unrecord::unrecord(&mut *txn.write(), &mut channel, &changes, &h2, 0, &repo)?;

Replacement in libpijul/src/tests/unrecord.rs at line 771 [12.248807]

B:BD[12.275627] → [40.11154:11238]

    crate::unrecord::unrecord(&mut *txn.write(), &mut channel2, &changes, &h1, 0)?;

[12.275627]

[12.275749]

    crate::unrecord::unrecord(&mut *txn.write(), &mut channel2, &changes, &h1, 0, &repo)?;

Replacement in libpijul/src/tests/unrecord.rs at line 817 [12.248807]

B:BD[22.1611] → [40.11905:12063]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h1, 0)?;
    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h2, 0)?;

[22.1611]

[22.1753]

    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h1, 0, &repo)?;
    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h2, 0, &repo)?;

Insertion in libpijul/src/tests/unrecord.rs at line 826 [12.248807]

[22.1870]

[12.276024]

    Ok(())
}
/// Delete the same file on two different channels, merge, unrecord each patch on the same channel. What happens to tree/revtree?
#[test]
fn fs_times() -> Result<(), anyhow::Error> {
    env_logger::try_init().unwrap_or(());
    let repo = working_copy::memory::Memory::new();
    let changes = changestore::memory::Memory::new();
    let env = pristine::sanakirja::Pristine::new_anon()?;
    let txn = env.arc_txn_begin().unwrap();
    let channel = txn.write().open_or_create_channel("main")?;
    repo.add_file("file", b"blabla\nblibli\nblublu\n".to_vec());
    repo.add_file("file2", b"blabla\nblibli\nblublu\n".to_vec());
    txn.write().add_file("file", 0)?;
    txn.write().add_file("file2", 0)?;
    let h0 = record_all(&repo, &changes, &txn, &channel, "")?;
    debug!("h0 = {:?}", h0);
    repo.write_file("file", Inode::ROOT)?
        .write_all(b"blabla\nblublu\n")?;
    let h1 = record_all(&repo, &changes, &txn, &channel, "")?;
    debug!("last {:?}", txn.read().last_modified(&channel.r.read()));
    // Modify file2, but set its modification time one hour ago, so we
    // can check that `unrecord` doesn't read the entire repo.
    repo.write_file("file2", Inode::ROOT)?
        .write_all(b"blabla\nblublu\n")?;
    repo.touch(
        "file2",
        std::time::SystemTime::now() - std::time::Duration::from_hours(1),
    )?;
    crate::unrecord::unrecord(&mut *txn.write(), &channel, &changes, &h1, 0, &repo)?;
    debug!("last {:?}", txn.read().last_modified(&channel.r.read()));
    info!("Final record");
    let h1 = record_all(&repo, &changes, &txn, &channel, "")?;
    let change1 = changes.get_change(&h1).unwrap();
    assert_eq!(change1.changes.len(), 1);

Insertion in libpijul/src/tests/missing_context.rs at line 101 [12.291589]
[40.22500]
[40.22500]
```
        &repo_alice,
```

Replacement in libpijul/src/tests/missing_context.rs at line 103 [12.291589]

B:BD[40.22508] → [40.22508:22602]

    crate::unrecord::unrecord(&mut *txn_alice.write(), &channel_alice, &changes, &bob_h, 0)?;

[40.22508]

[24.14172]

    crate::unrecord::unrecord(
        &mut *txn_alice.write(),
        &channel_alice,
        &changes,
        &bob_h,
        0,
        &repo_alice,
    )?;

Insertion in libpijul/src/tests/missing_context.rs at line 155 [12.291589]
[40.23378]
[40.23378]
```
        &repo_bob,
```
Insertion in libpijul/src/tests/file_conflicts.rs at line 1460 [12.305506]
[40.48051]
[40.48051]
```
        &repo_alice,
```

Replacement in libpijul/src/tests/diff.rs at line 28 [42.162]

B:BD[42.1138] → [42.1138:1230]

B:BD[42.1230] → [9.81:108]

∅:D[9.108] → [42.1290:1301]

B:BD[42.1290] → [42.1290:1301]

        contents.extend(
            (&mut rng)
                .sample_iter(&Alphanumeric)
                .take(80),
        );

[42.1138]

[9.109]

        contents.extend((&mut rng).sample_iter(&Alphanumeric).take(80));

Replacement in libpijul/src/tests/conflict.rs at line 179 [12.357372]

B:BD[12.362243] → [40.51524:51623]

    crate::unrecord::unrecord(&mut *txn.write(), &channel_bob, &changes, &resolution, 0).unwrap();

[12.362243]

[12.362394]

    crate::unrecord::unrecord(
        &mut *txn.write(),
        &channel_bob,
        &changes,
        &resolution,
        0,
        &repo_bob,
    )
    .unwrap();

Insertion in libpijul/src/tests/conflict.rs at line 2279 [12.357372]
[40.74463]
[40.74463]
```
        &repo_bob,
```
Insertion in libpijul/src/record.rs at line 550 [12.488880]
[12.495538]
[16.50469]
```
        txn.write().touch_channel(&mut channel.write(), None);
```
Replacement in libpijul/src/record.rs at line 909 [12.488880]
∅:D[43.160] → [16.56558:56597]
B:BD[16.56558] → [16.56558:56597]
```
            txn.last_modified(channel)
```
[43.160]
[16.56597]
```
            txn.last_modified(channel),
```
Insertion in libpijul/src/record.rs at line 922 [12.488880]
[3.817]
[3.817]
```
        debug!("recording = {:?}", last_mod >= channel_mod);
```

Replacement in libpijul/src/record.rs at line 1357 [12.488880]

B:BD[35.2023] → [35.2023:2051]

.0,

[35.2023]

[12.509979]

                        .0
                        .join("/"),

Replacement in libpijul/src/pristine/mod.rs at line 2156 [12.586748]
∅:D[44.750] → [45.590:633]
∅:D[46.2073] → [45.590:633]
∅:D[29.77352] → [45.590:633]
B:BD[45.590] → [45.590:633]
```
        let path = path.replace("/", "_");
```
[44.750]
[45.633]
```
        let path = path.join("_");
```
Insertion in libpijul/src/output/archive.rs at line 3 [12.690044]
[12.690096]
[12.690096]
```
use crate::working_copy::WorkingCopy;
```
Insertion in libpijul/src/output/archive.rs at line 104 [12.690044]
[30.25378]
[30.25378]
```
    W: std::error::Error + 'static,
```

Replacement in libpijul/src/output/archive.rs at line 115 [12.690044]

B:BD[30.25482] → [30.25482:25542]

    Unrecord(#[from] crate::unrecord::UnrecordError<P, T>),

[30.25482]

[30.25542]

    Unrecord(#[from] crate::unrecord::UnrecordError<P, W, T>),

Replacement in libpijul/src/output/archive.rs at line 126 [12.690044]

B:BD[12.692169] → [23.31345:31485]

impl<P: std::error::Error + 'static, T: GraphTxnT + TreeTxnT, A: std::error::Error + 'static>
    std::fmt::Debug for ArchiveError<P, T, A>

[12.692169]

[29.87733]

impl<
        P: std::error::Error + 'static,
        T: GraphTxnT + TreeTxnT,
        A: std::error::Error + 'static,
        W: std::error::Error + 'static,
    > std::fmt::Debug for ArchiveError<P, T, A, W>

Insertion in libpijul/src/output/archive.rs at line 154 [12.690044]
[29.87931]
[29.87931]
```
    W: WorkingCopy,
```

Replacement in libpijul/src/output/archive.rs at line 161 [12.690044]

B:BD[12.692359] → [23.32308:32374]

) -> Result<Vec<Conflict>, ArchiveError<P::Error, T, A::Error>> {

[12.692359]

[12.692439]

) -> Result<Vec<Conflict>, ArchiveError<P::Error, T, A::Error, W::Error>> {

Replacement in libpijul/src/lib.rs at line 219 [12.717381]

B:BD[12.725196] → [12.725196:725242]

    fn unrecord<C: changestore::ChangeStore>(

[12.725196]

[12.725242]

    fn unrecord<C: changestore::ChangeStore, W: working_copy::WorkingCopy>(

Replacement in libpijul/src/lib.rs at line 225 [12.717381]

B:BD[18.4209] → [23.33168:33233]

∅:D[23.33233] → [18.4210:4273]

B:BD[29.94683] → [18.4210:4273]

    ) -> Result<bool, unrecord::UnrecordError<C::Error, Self>> {
        unrecord::unrecord(self, channel, changes, hash, salt)

[18.4209]

[12.725459]

        working_copy: &W,
    ) -> Result<bool, unrecord::UnrecordError<C::Error, W::Error, Self>> {
        unrecord::unrecord(self, channel, changes, hash, salt, working_copy)

Replacement in libpijul/src/lib.rs at line 431 [12.717381]

B:BD[12.732181] → [40.104220:104291]

        fs::find_path(changes, self, &channel.read(), false, position)

[12.732181]

[12.732254]

        if let Some((a, b)) = fs::find_path(changes, self, &channel.read(), false, position)? {
            Ok(Some((a.join("/"), b)))
        } else {
            Ok(None)
        }

Replacement in libpijul/src/lib.rs at line 448 [12.717381]

B:BD[12.732653] → [40.104292:104362]

        fs::find_path(changes, self, &channel.read(), true, position)

[12.732653]

[12.732725]

        if let Some((a, b)) = fs::find_path(changes, self, &channel.read(), true, position)? {
            Ok(Some((a.join("/"), b)))
        } else {
            Ok(None)
        }

Replacement in libpijul/src/lib.rs at line 476 [12.717381]

B:BD[13.6399] → [13.6399:6460]

    pub fn archive<C: changestore::ChangeStore, A: Archive>(

[13.6399]

[12.733620]

    pub fn archive<C: changestore::ChangeStore, A: Archive, W: working_copy::WorkingCopy>(

Replacement in libpijul/src/lib.rs at line 481 [12.717381]

B:BD[12.733724] → [13.6505:6591]

∅:D[13.6591] → [12.733780:733859]

∅:D[30.30328] → [12.733780:733859]

∅:D[23.34199] → [12.733780:733859]

∅:D[29.99249] → [12.733780:733859]

B:BD[12.733780] → [12.733780:733859]

    ) -> Result<Vec<output::Conflict>, output::ArchiveError<C::Error, T, A::Error>> {
        output::archive(changes, self, channel, &mut std::iter::empty(), arch)

[12.733724]

[12.733859]

    ) -> Result<Vec<output::Conflict>, output::ArchiveError<C::Error, T, A::Error, W::Error>> {
        output::archive::<_, _, _, _, W>(changes, self, channel, &mut std::iter::empty(), arch)

Insertion in libpijul/src/lib.rs at line 490 [12.717381]
[13.6725]
[13.6725]
```
        W: working_copy::WorkingCopy,
```

Replacement in libpijul/src/lib.rs at line 497 [12.717381]

B:BD[12.734091] → [13.6777:6863]

∅:D[13.6863] → [12.734147:734209]

∅:D[30.30425] → [12.734147:734209]

∅:D[23.34289] → [12.734147:734209]

∅:D[29.99355] → [12.734147:734209]

B:BD[12.734147] → [12.734147:734209]

    ) -> Result<Vec<output::Conflict>, output::ArchiveError<C::Error, T, A::Error>> {
        output::archive(changes, self, channel, prefix, arch)

[12.734091]

[13.6864]

    ) -> Result<Vec<output::Conflict>, output::ArchiveError<C::Error, T, A::Error, W::Error>> {
        output::archive::<_, _, _, _, W>(changes, self, channel, prefix, arch)

Replacement in libpijul/src/lib.rs at line 503 [12.717381]

B:BD[13.6902] → [13.6902:6974]

    pub fn archive_with_state<P: changestore::ChangeStore, A: Archive>(

[13.6902]

[13.6974]

    pub fn archive_with_state<
        P: changestore::ChangeStore,
        A: Archive,
        W: working_copy::WorkingCopy,
    >(

Replacement in libpijul/src/lib.rs at line 515 [12.717381]

B:BD[13.7162] → [13.7162:7248]

    ) -> Result<Vec<output::Conflict>, output::ArchiveError<P::Error, T, A::Error>> {

[13.7162]

[13.7248]

        working_copy: &W,
    ) -> Result<Vec<output::Conflict>, output::ArchiveError<P::Error, T, A::Error, W::Error>> {

Insertion in libpijul/src/lib.rs at line 525 [12.717381]
[13.7441]
[13.7441]
```
            working_copy,
```
Insertion in libpijul/src/lib.rs at line 536 [12.717381]
[13.7710]
[13.7710]
```
        W: working_copy::WorkingCopy,
```

Replacement in libpijul/src/lib.rs at line 547 [12.717381]

B:BD[13.7966] → [13.7966:8052]

    ) -> Result<Vec<output::Conflict>, output::ArchiveError<P::Error, T, A::Error>> {

[13.7966]

[13.8052]

        working_copy: &W,
    ) -> Result<Vec<output::Conflict>, output::ArchiveError<P::Error, T, A::Error, W::Error>> {

Replacement in libpijul/src/lib.rs at line 566 [12.717381]

B:BD[13.8641] → [13.8641:8717]

                unrecord::unrecord(&mut *txn, channel, changes, &h, salt)?;

[13.8641]

[13.8717]

                unrecord::unrecord(&mut *txn, channel, changes, &h, salt, working_copy)?;

Replacement in libpijul/src/lib.rs at line 575 [12.717381]

B:BD[13.9003] → [13.9003:9069]

            output::archive(changes, self, channel, prefix, arch)

[13.9003]

[13.9069]

            output::archive::<_, _, _, _, W>(changes, self, channel, prefix, arch)

Replacement in libpijul/src/fs.rs at line 181 [12.737429]
∅:D[47.9] → [12.741561:741617]
∅:D[48.4882] → [12.741561:741617]
B:BD[12.741561] → [12.741561:741617]
```
/// Find the filename leading from the root to ~inode~.
```
[48.4882]
[29.103454]
```
/// Find the filename leading from the root to `inode`.
```

Insertion in libpijul/src/fs.rs at line 952 [12.737429]

[12.760897]

[29.113826]

/// Compute either the oldest or the youngest filesystem path to a
/// graph vertex.

Replacement in libpijul/src/fs.rs at line 960 [12.737429]

B:BD[12.761102] → [23.36150:36227]

) -> Result<Option<(String, bool)>, crate::output::FileError<C::Error, T>> {

[12.761102]

[12.761147]

) -> Result<Option<(Vec<String>, bool)>, crate::output::FileError<C::Error, T>> {

Replacement in libpijul/src/fs.rs at line 1062 [12.737429]
B:BD[12.763251] → [46.2748:2790]
```
    Ok(Some((path.join("/"), all_alive)))
```
[12.763251]
[49.628]
```
    Ok(Some((path, all_alive)))
```

Optimisation: avoid re-checking the entire repo when recording after an unrecord

Dependencies

In channels

Change contents

Insertion in pijul-remote/src/lib.rs at line 1048 [12.52474]

Replacement in pijul-remote/src/lib.rs at line 1057 [12.52474]

Replacement in pijul/src/commands/unrecord.rs at line 128 [12.95630]

Replacement in pijul/src/commands/unrecord.rs at line 146 [12.95630]

Insertion in pijul/src/commands/record.rs at line 123 [12.101759]

Replacement in pijul/src/commands/pushpull.rs at line 745 [12.111631]

Replacement in pijul/src/commands/pushpull.rs at line 892 [12.111631]

Insertion in pijul/src/commands/protocol.rs at line 312 [12.123281]

Replacement in pijul/src/commands/fork.rs at line 57 [12.167873]

Insertion in pijul/src/commands/archive.rs at line 120 [12.191083]

Insertion in libpijul/src/working_copy/mod.rs at line 50 [12.198172]

Insertion in libpijul/src/working_copy/memory.rs at line 332 [12.199222]

Insertion in libpijul/src/working_copy/filesystem.rs at line 487 [12.208900]

Insertion in libpijul/src/unrecord/working_copy.rs at line 5 [12.225940]

Replacement in libpijul/src/unrecord/working_copy.rs at line 24 [12.225940]

Replacement in libpijul/src/unrecord/working_copy.rs at line 35 [12.225940]

Replacement in libpijul/src/unrecord/working_copy.rs at line 42 [12.225940]

Replacement in libpijul/src/unrecord/working_copy.rs at line 48 [12.225940]

Replacement in libpijul/src/unrecord/working_copy.rs at line 55 [12.225940]

Replacement in libpijul/src/unrecord/working_copy.rs at line 62 [12.225940]

Replacement in libpijul/src/unrecord/working_copy.rs at line 86 [12.225940]

Replacement in libpijul/src/unrecord/working_copy.rs at line 88 [12.225940]

Replacement in libpijul/src/unrecord/working_copy.rs at line 92 [12.225940]

Replacement in libpijul/src/unrecord/working_copy.rs at line 103 [12.225940]

Replacement in libpijul/src/unrecord/working_copy.rs at line 110 [12.225940]

Insertion in libpijul/src/unrecord/working_copy.rs at line 188 [12.225940]

Replacement in libpijul/src/unrecord/working_copy.rs at line 193 [12.225940]

Replacement in libpijul/src/unrecord/mod.rs at line 5 [12.231493]

Replacement in libpijul/src/unrecord/mod.rs at line 11 [12.231493]

Insertion in libpijul/src/unrecord/mod.rs at line 39 [12.231493]

Replacement in libpijul/src/unrecord/mod.rs at line 43 [12.231493]

Insertion in libpijul/src/unrecord/mod.rs at line 68 [12.231493]

Replacement in libpijul/src/unrecord/mod.rs at line 73 [12.231493]

Replacement in libpijul/src/unrecord/mod.rs at line 79 [12.231493]

Replacement in libpijul/src/unrecord/mod.rs at line 89 [12.231493]

Replacement in libpijul/src/unrecord/mod.rs at line 95 [12.231493]

Insertion in libpijul/src/unrecord/mod.rs at line 123 [12.231493]

Replacement in libpijul/src/unrecord/mod.rs at line 128 [12.231493]

Insertion in libpijul/src/unrecord/mod.rs at line 179 [12.231493]

Replacement in libpijul/src/unrecord/mod.rs at line 187 [12.231493]

Replacement in libpijul/src/unrecord/mod.rs at line 199 [12.231493]

Replacement in libpijul/src/unrecord/mod.rs at line 217 [12.231493]