jcdickinson/pijul - Change CXSCA5HNK3BSSUMZ2SZ5XNKSSHC2IFHPC35SMO5WMWVJBYEFSJTQC

Fixing a counter-intuitive error when a local repo does not exist

Created by pmeunier on December 6, 2021

CXSCA5HNK3BSSUMZ2SZ5XNKSSHC2IFHPC35SMO5WMWVJBYEFSJTQC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/remote/ssh.rs at line 88 [3.25380]

B:BD[3.27320] → [4.531:626]

    pub async fn connect(&mut self, name: &str, channel: &str) -> Result<Ssh, anyhow::Error> {

[3.27320]

[3.27411]

    pub async fn connect(
        &mut self,
        name: &str,
        channel: &str,
    ) -> Result<Option<Ssh>, anyhow::Error> {

Replacement in pijul/src/remote/ssh.rs at line 106 [3.25380]

B:BD[3.27694] → [4.677:727]

        let stream = self.config.stream().await?;

[3.27694]

        let stream = match self.config.stream().await {
            Ok(stream) => stream,
            Err(e) => {
                info!("remote connect error: {:?}", e);
                return Ok(None);
            }
        };

Replacement in pijul/src/remote/ssh.rs at line 137 [3.25380]
B:BD[3.28569] → [3.28569:28586]
```
        Ok(Ssh {
```
[3.28569]
[3.28586]
```
        Ok(Some(Ssh {
```
Replacement in pijul/src/remote/ssh.rs at line 147 [3.25380]
∅:D[5.178] → [3.28790:28801]
∅:D[6.186] → [3.28790:28801]
B:BD[3.28790] → [3.28790:28801]
```
        })
```
[5.178]
[3.28801]
```
        }))
```

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

B:BD[7.543] → [8.6204:6276]

            return if let Some(mut ssh) = ssh_remote(name, with_path) {

[7.543]

[7.604]

            if let Some(mut ssh) = ssh_remote(name, with_path) {

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

B:BD[7.663] → [7.663:824]

                Ok(RemoteRepo::Ssh(ssh.connect(name, channel).await?))
            } else {
                bail!("Remote not found: {:?}", name)
            };

[7.663]

[3.54130]

                if let Some(c) = ssh.connect(name, channel).await? {
                    return Ok(RemoteRepo::Ssh(c));
                }
            }
            bail!("Remote not found: {:?}", name)

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

B:BD[3.54479] → [9.7031:7129]

∅:D[9.7129] → [3.54566:54603]

B:BD[3.54566] → [3.54566:54603]

B:BD[3.54603] → [10.724:772]

B:BD[10.772] → [11.0:53]

∅:D[11.53] → [3.54644:54719]

∅:D[10.772] → [3.54644:54719]

B:BD[3.54644] → [3.54644:54719]

B:BD[3.54719] → [6.10385:10431]

B:BD[3.54798] → [3.54798:54838]

B:BD[3.54838] → [10.773:790]

        if let Ok(pristine) = libpijul::pristine::sanakirja::Pristine::new(&dot_dir.join("db")) {
            debug!("pristine done");
            return Ok(RemoteRepo::Local(Local {
                root: Path::new(name).to_path_buf(),
                channel: channel.to_string(),
                changes_dir,
                pristine: Arc::new(pristine),
                name: name.to_string(),
            }));

[3.54479]

[3.55165]

        match libpijul::pristine::sanakirja::Pristine::new(&dot_dir.join("db")) {
            Ok(pristine) => {
                debug!("pristine done");
                return Ok(RemoteRepo::Local(Local {
                    root: Path::new(name).to_path_buf(),
                    channel: channel.to_string(),
                    changes_dir,
                    pristine: Arc::new(pristine),
                    name: name.to_string(),
                }));
            }
            Err(libpijul::pristine::sanakirja::SanakirjaError::Sanakirja(
                sanakirja::Error::IO(e),
            )) if e.kind() == std::io::ErrorKind::NotFound => {
                debug!("repo not found")
            }
            Err(e) => return Err(e.into()),

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

B:BD[10.884] → [10.884:960]

B:BD[10.960] → [12.8297:8343]

        Ok(RemoteRepo::Ssh(ssh.connect(name, channel).await?))
    } else {
        bail!("Remote not found: {:?}", name)

[10.884]

[2.210]

        if let Some(c) = ssh.connect(name, channel).await? {
            return Ok(RemoteRepo::Ssh(c));
        }

Insertion in pijul/src/remote/mod.rs at line 131 [3.52474]
[2.216]
[2.216]
```
    bail!("Remote not found: {:?}", name)
```

Replacement in pijul/src/commands/key.rs at line 110 [13.2558]

B:BD[8.23404] → [8.23404:23476]

                    ssh.connect(&remote, crate::DEFAULT_CHANNEL).await?

[8.23404]

[8.23476]

                    if let Some(c) = ssh.connect(&remote, crate::DEFAULT_CHANNEL).await? {
                        c
                    } else {
                        bail!("No such remote: {}", remote)
                    }