dblsaiko/pijul - Change 2GQCLJZGIXMTKDVMYIIQJDOR5EXGBZS5FKH2S4DTN25WKKBUMQQQC

Displaying errors returned by the server in the protocol

Created by pmeunier on January 10, 2021

2GQCLJZGIXMTKDVMYIIQJDOR5EXGBZS5FKH2S4DTN25WKKBUMQQQC

Dependencies

In channels

main

Change contents

Insertion in pijul/src/remote/ssh.rs at line 708 [3.25380]

[2.769]

                super::ListLine::Error(err) => {
                    bail!(err)
                }

Insertion in pijul/src/remote/mod.rs at line 672 [3.52474]
[2.3339]
[2.3339]
```
    Error(String),
```

Replacement in pijul/src/remote/mod.rs at line 683 [3.52474]

B:BD[2.3716] → [2.3716:3780]

                n: caps.name("num").unwrap().as_str().parse()?,

[2.3716]

[2.3780]

                n: caps.name("num").unwrap().as_str().parse().unwrap(),

Insertion in pijul/src/remote/mod.rs at line 689 [3.52474]

[2.3850]

    if data.starts_with("error:") {
        return Ok(ListLine::Error(data.split_at(6).1.to_string()));
    }

Replacement in pijul/src/remote/mod.rs at line 698 [3.52474]

B:BD[3.79713] → [2.4146:4202]

    bail!("Protocol error, offending line: {:?}", data)

[3.79713]

[3.79731]

    debug!("offending line: {:?}", data);
    bail!("Protocol error")

Insertion in pijul/src/remote/http.rs at line 196 [4.10]

[2.6342]

                        }
                        super::ListLine::Error(e) => {
                            let mut stderr = std::io::stderr();
                            writeln!(stderr, "{}", e)?;