ilyagr/pijul - Change VNBLGT6GAN2AHKRFKTKED7WNDDRGNULY5H343ZYV3ETSDZZKGBTAC

Do not output unmodified files when resetting (fix)

Created by pmeunier on January 10, 2021

VNBLGT6GAN2AHKRFKTKED7WNDDRGNULY5H343ZYV3ETSDZZKGBTAC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/commands/reset.rs at line 7 [6.97650]

B:BD[4.1330] → [5.43:89]

use libpijul::pristine::{ChangeId, Position};

[4.1330]

[5.89]

use libpijul::pristine::{ChangeId, ChannelMutTxnT, Position};

Replacement in pijul/src/commands/reset.rs at line 72 [6.97650]

B:BD[7.604] → [5.165:204]

B:BD[5.204] → [3.65:145]

∅:D[3.145] → [5.204:486]

B:BD[5.204] → [5.204:486]

B:BD[5.486] → [3.146:191]

∅:D[3.191] → [5.486:545]

B:BD[5.486] → [5.486:545]

                if overwrite_changes {
                    let last_modified = last_modified(&txn, &channel.borrow());
                    txn.output_repository_no_pending(
                        &mut repo.working_copy,
                        &repo.changes,
                        &mut channel,
                        &mut HashMap::new(),
                        "",
                        true,
                        Some(last_modified),
                    )?;
                    txn.commit()?;

[7.604]

[8.869]

                if !overwrite_changes {
                    return Ok(());

Deletion in pijul/src/commands/reset.rs at line 75 [6.97650]
B:BD[8.887] → [5.546:577]
```
                return Ok(());
```

Insertion in pijul/src/commands/reset.rs at line 96 [6.97650]

[6.100946]

[5.578]

                if self.channel.is_none() || self.channel.as_deref() == Some(current_channel) {
                    let last_modified = last_modified(&txn, &channel.borrow());
                    txn.output_repository_no_pending(
                        &mut repo.working_copy,
                        &repo.changes,
                        &mut channel,
                        &mut HashMap::new(),
                        "",
                        true,
                        Some(last_modified),
                    )?;
                    txn.touch_channel(&mut channel.borrow_mut(), None);
                    txn.commit()?;
                    return Ok(());
                }

Replacement in pijul/src/commands/record.rs at line 123 [6.101759]

B:BD[6.105296] → [2.371:686]

            let oldest = std::time::SystemTime::now();
            let oldest = if let Ok(t) = oldest.duration_since(std::time::SystemTime::UNIX_EPOCH) {
                t.as_secs() as u64
            } else {
                0
            };
            txn.touch_channel(&mut channel.borrow_mut(), Some(oldest));

[6.105296]

[2.686]

            txn.touch_channel(&mut channel.borrow_mut(), None);

Replacement in libpijul/src/output/output.rs at line 187 [6.671807]

B:BD[6.678511] → [3.1699:2082]

                    let output = if let Some(m) = if_modified_after {
                        if let Ok(last) = repo.modified_time(&path) {
                            last >= m
                        } else {
                            true
                        }
                    } else {
                        true
                    };
                    if output {

[6.678511]

[3.2082]

                    if needs_output(repo, if_modified_after, &path) {

Insertion in libpijul/src/output/output.rs at line 199 [6.671807]

[3.2574]

                    } else {
                        debug!("Not outputting {:?}", path)

Insertion in libpijul/src/output/output.rs at line 231 [6.671807]

[9.21084]

[10.82825]

fn needs_output<R: WorkingCopy>(repo: &R, if_modified_after: Option<std::time::SystemTime>, path: &str) -> bool {
    if let Some(m) = if_modified_after {
        if let Ok(last) = repo.modified_time(path) {
            debug!("modified_after: {:?} {:?}", m, last);
            if let Ok(d) = last.duration_since(m) {
                return d.as_secs() > 0
            } else {
                return false
            }
        }
    }
    true
}