ilyagr/pijul - Change 6RVT5X4LTRP5XHVDESXMIC2DHMT5MUQ24ZDWEBJ4XYTF6LJXK7CAC

Current state: return zero instead of an Option if there is no change on the channel

Created by pmeunier on December 15, 2020

6RVT5X4LTRP5XHVDESXMIC2DHMT5MUQ24ZDWEBJ4XYTF6LJXK7CAC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/commands/protocol.rs at line 201 [3.123281]

B:BD[3.131779] → [3.131779:131876]

                    if txn.current_state(&channel.borrow()) == Some(state) && extra.is_empty() {

[3.131779]

[3.131876]

                    if txn.current_state(&channel.borrow()) == state && extra.is_empty() {

Replacement in pijul/src/commands/git.rs at line 651 [3.137210]

B:BD[2.404] → [2.404:474]

            return Ok(txn.current_state(&channel.borrow()).unwrap());

[2.404]

[2.474]

            return Ok(txn.current_state(&channel.borrow()));

Replacement in pijul/src/commands/git.rs at line 676 [3.137210]

B:BD[3.160242] → [3.160242:160306]

B:BD[3.160306] → [4.333:434]

∅:D[4.434] → [3.160364:160370]

B:BD[3.160364] → [3.160364:160370]

    if let Some(state) = state {
        Ok(state)
    } else {
        Ok(txn
            .current_state(&channel.borrow())
            .unwrap_or(Merkle::zero()))
    }

[3.160242]

[3.160370]

    Ok(state)

Replacement in pijul/src/commands/git.rs at line 736 [3.137210]
B:BD[3.161804] → [3.161804:161837]
```
    Ok((n, Some(hash), Some(m)))
```
[3.161804]
[3.161837]
```
    Ok((n, Some(hash), m))
```
Replacement in libpijul/src/pristine/mod.rs at line 392 [3.586748]
B:BD[5.40230] → [5.40230:40252]
```
) -> Option<Merkle> {
```
[5.40230]
[5.40252]
```
) -> Merkle {
```
Insertion in libpijul/src/pristine/mod.rs at line 396 [3.586748]
[5.40357]
[5.40357]
```
        .unwrap_or(Merkle::zero())
```

Replacement in libpijul/src/lib.rs at line 405 [3.717381]

B:BD[3.730331] → [5.60805:60898]

    fn current_state(&self, channel: &pristine::Channel<Self>) -> Option<pristine::Merkle> {

[3.730331]

[5.60898]

    fn current_state(&self, channel: &pristine::Channel<Self>) -> pristine::Merkle {