pijul/pijul - Change IP4CUEBEHNVTHTLRBXH27TDN6H5GA34GMR6LWY2GGHWGF6LW24CQC

reset: Require --force to reset unspecified unrecorded changes

Created by spacefrogg on June 16, 2022

IP4CUEBEHNVTHTLRBXH27TDN6H5GA34GMR6LWY2GGHWGF6LW24CQC

Dependencies

In channels

main

In discussions

#688 Make pijul reset safer

Change contents

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

∅:D[3.303] → [4.0:62]

B:BD[6.1330] → [4.0:62]

B:BD[4.62] → [7.6290:6353]

use libpijul::pristine::{ChangeId, ChannelMutTxnT, Position};
use libpijul::{ChannelTxnT, DepsTxnT, MutTxnT, TxnT, TxnTExt};

[3.303]

[7.6353]

use libpijul::pristine::{sanakirja::MutTxn, ChangeId, ChannelMutTxnT, Position};
use libpijul::{ArcTxn, ChannelRef, ChannelTxnT, DepsTxnT, MutTxnT, TxnT, TxnTExt};

Replacement in pijul/src/commands/reset.rs at line 112 [5.97650]

B:BD[7.7517] → [7.7517:7696]

B:BD[7.7696] → [2.16:43]

∅:D[2.43] → [3.330:380]

B:BD[7.7696] → [3.330:380]

∅:D[3.380] → [7.7696:7733]

B:BD[7.7696] → [7.7696:7733]

B:BD[7.7733] → [8.3955:3995]

∅:D[8.3995] → [7.7780:8038]

B:BD[7.7780] → [7.7780:8038]

                let mut state = libpijul::RecordBuilder::new();
                state.record(
                    txn.clone(),
                    libpijul::Algorithm::default(),
                    false,
                    &libpijul::DEFAULT_SEPARATOR,
                    channel.clone(),
                    &repo.working_copy,
                    &repo.changes,
                    "",
                    num_cpus::get(),
                )?;
                let rec = state.finish();
                debug!("actions = {:?}", rec.actions);
                if !rec.actions.is_empty() {

[7.7517]

[7.8038]

                if has_unrecorded_changes(txn.clone(), channel.clone(), &repo).unwrap() {

Insertion in pijul/src/commands/reset.rs at line 123 [5.97650]

[8.4079]

[7.8400]

                if !self.force && has_unrecorded_changes(txn.clone(), channel.clone(), &repo).unwrap() {
                    bail!("Refusing to reset, as there are unrecorded changes. Use --force")
                }

Insertion in pijul/src/commands/reset.rs at line 283 [5.97650]

[5.101746]


fn has_unrecorded_changes(txn: ArcTxn<MutTxn<()>>,
                          channel: ChannelRef<MutTxn<()>>,
                          repo: &Repository) -> Result<bool, anyhow::Error> {
    let mut state = libpijul::RecordBuilder::new();
    state.record(
        txn,
        libpijul::Algorithm::default(),
        false,
        &libpijul::DEFAULT_SEPARATOR,
        channel,
        &repo.working_copy,
        &repo.changes,
        "",
        num_cpus::get(),
    )?;
    let rec = state.finish();
    debug!("actions = {:?}", rec.actions);
    Ok(!rec.actions.is_empty())
}