ilyagr/pijul - Change GDAKVAFRCRJ4RJSXHTZOKRZCTWCB4HKYZMUBHVVRKALWEKWRHDLQC

Fixing apply (ghost channels could happen in case of error)

Created by pmeunier on May 21, 2023

GDAKVAFRCRJ4RJSXHTZOKRZCTWCB4HKYZMUBHVVRKALWEKWRHDLQC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/commands/apply.rs at line 61 [4.194289]

B:BD[3.54] → [3.54:362]

        // Channel used to check if we can output the repo.
        let forked_s: String = rand::thread_rng()
            .sample_iter(&rand::distributions::Alphanumeric)
            .take(20)
            .map(char::from)
            .collect();
        let forked = txn.write().fork(&channel, &forked_s)?;

[3.54]

[5.816]

        // Forked channel before the apply, in order to check whether
        // we are overwriting a path.
        let forked = if is_current_channel {
            let forked_s: String = rand::thread_rng()
                .sample_iter(&rand::distributions::Alphanumeric)
                .take(20)
                .map(char::from)
                .collect();
            let forked = txn.write().fork(&channel, &forked_s)?;
            Some((forked_s, forked))
        } else {
            None
        };

Replacement in pijul/src/commands/apply.rs at line 129 [4.194289]
∅:D[6.23732] → [7.2923:2955]
B:BD[8.1107] → [7.2923:2955]
```
        if is_current_channel {
```
[8.1107]
[7.2955]
```
        if let Some((_, ref forked)) = forked {
```

Deletion in pijul/src/commands/apply.rs at line 188 [4.194289]

B:BD[9.1512] → [3.560:585]

B:BD[3.585] → [2.0:44]

∅:D[2.44] → [3.585:643]

B:BD[3.585] → [3.585:643]

                } else {
                    std::mem::drop(forked);
                    txn.write().drop_channel(&forked_s)?;

Insertion in pijul/src/commands/apply.rs at line 227 [4.194289]

[10.1652]

[4.196314]

        if let Some((forked_s, forked)) = forked {
            std::mem::drop(forked);
            txn.write().drop_channel(&forked_s)?;
        }