ilyagr/pijul - Change K7JPP64SNKZNMB6XJAYYHDC2464I3BQDLVA3IX4YCQZ4P5TXZXRAC

Faster error in unrecord when the change is not on the channel

Created by pmeunier on April 29, 2021

K7JPP64SNKZNMB6XJAYYHDC2464I3BQDLVA3IX4YCQZ4P5TXZXRAC

Dependencies

In channels

main

Change contents

Deletion in pijul/src/commands/unrecord.rs at line 47 [3.95630]

B:BD[2.2241] → [2.2241:2546]

∅:D[2.2546] → [4.485:486]

B:BD[4.485] → [4.485:486]

        let pending_hash = if self.reset {
            super::pending(txn.clone(), &channel, &mut repo)?
        } else {
            None
        };
        let mut txn = if let Ok(txn) = Arc::try_unwrap(txn) {
            txn.into_inner().unwrap()
        } else {
            unreachable!()
        };

Insertion in pijul/src/commands/unrecord.rs at line 65 [3.95630]
[5.2791]
[2.3331]
```
            let txn = txn.read().unwrap();
```
Insertion in pijul/src/commands/unrecord.rs at line 76 [3.95630]
[2.3800]
[2.3800]
```
            let txn = txn.read().unwrap();
```

Replacement in pijul/src/commands/unrecord.rs at line 84 [3.95630]

B:BD[2.4072] → [2.4072:4299]

        for (hash, change_id) in hashes {
            let n = txn
                .get_changeset(txn.changes(&channel_), &change_id)
                .unwrap();
            changes.push((hash, change_id, n.map(|&x| x.into())));

[2.4072]

[2.4299]

        {
            let txn = txn.read().unwrap();
            for (hash, change_id) in hashes {
                let n = txn
                    .get_changeset(txn.changes(&channel_), &change_id)
                    .unwrap();
                if n.is_none() {
                    bail!("Change not in channel: {:?}", hash)
                }
                changes.push((hash, change_id, n.map(|&x| x.into())));
            }

Insertion in pijul/src/commands/unrecord.rs at line 96 [3.95630]
[2.4309]
[2.4309]
```
        debug!("changes: {:?}", changes);
```

Insertion in pijul/src/commands/unrecord.rs at line 98 [3.95630]

[2.4343]

        let pending_hash = if self.reset {
            super::pending(txn.clone(), &channel, &mut repo)?
        } else {
            None
        };

Replacement in pijul/src/commands/unrecord.rs at line 106 [3.95630]

B:BD[2.4480] → [2.4480:4532]

            for p in txn.iter_revdep(&change_id)? {

[2.4480]

[2.4532]

            let txn_ = txn.read().unwrap();
            for p in txn_.iter_revdep(&change_id)? {

Replacement in pijul/src/commands/unrecord.rs at line 114 [3.95630]

B:BD[2.4719] → [2.4719:4870]

                if txn.get_changeset(txn.changes(&channel_), d)?.is_some() {
                    let dep: Hash = txn.get_external(d)?.unwrap().into();

[2.4719]

[2.4870]

                if txn_.get_changeset(txn_.changes(&channel_), d)?.is_some() {
                    let dep: Hash = txn_.get_external(d)?.unwrap().into();

Replacement in pijul/src/commands/unrecord.rs at line 131 [3.95630]

B:BD[2.5418] → [2.5418:5477]

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

[2.5418]

[2.5477]

            std::mem::drop(txn_);
            txn.write().unwrap().unrecord(&repo.changes, &channel, &hash)?;

Deletion in pijul/src/commands/unrecord.rs at line 135 [3.95630]
B:BD[2.5488] → [2.5488:5534]
```
        let txn = Arc::new(RwLock::new(txn));
```