pijul/pijul - Change 2MWJ2H6CQVPV2M2HOYOI4EHEK37E4EKLNQISGFUYVH2KCTAJQDCQC

Add support for named remotes.

Created by Skia on December 31, 2020

2MWJ2H6CQVPV2M2HOYOI4EHEK37E4EKLNQISGFUYVH2KCTAJQDCQC

Dependencies

In discussions

#243 Better Remotes

Change contents

Insertion in pijul/src/remote/mod.rs at line 43 [6.52474]
[6.53051]
[6.53051]
```
        location: &str,
```

Replacement in pijul/src/remote/mod.rs at line 47 [6.52474]

B:BD[6.53148] → [6.53148:53208]

B:BD[6.53208] → [7.62:136]

∅:D[7.136] → [6.53271:53288]

B:BD[6.53271] → [6.53271:53288]

B:BD[6.53288] → [7.137:211]

∅:D[7.211] → [6.53351:53361]

B:BD[6.53351] → [6.53351:53361]

        if let Some(name) = self.config.remotes.get(name) {
            unknown_remote(self_path, name, channel, no_cert_check).await
        } else {
            unknown_remote(self_path, name, channel, no_cert_check).await
        }

[6.53148]

[6.53361]

        unknown_remote(self_path, name, location, channel, no_cert_check).await

Deletion in pijul/src/remote/mod.rs at line 50 [6.52474]
B:BD[6.53369] → [6.53369:53370]
Insertion in pijul/src/remote/mod.rs at line 53 [6.52474]
[6.53415]
[6.53415]
```
    location: &str,
```

Replacement in pijul/src/remote/mod.rs at line 57 [6.52474]

B:BD[6.53500] → [6.53500:53622]

    if name.starts_with("http://") || name.starts_with("https://") {
        debug!("unknown_remote, http = {:?}", name);

[6.53500]

[7.243]

    if location.starts_with("http://") || location.starts_with("https://") {
        debug!("unknown_remote, http = {:?}", location);

Replacement in pijul/src/remote/mod.rs at line 60 [6.52474]
∅:D[7.285] → [6.53657:53692]
B:BD[6.53657] → [6.53657:53692]
```
            url: name.to_string(),
```
[7.285]
[6.53692]
```
            url: location.to_string(),
```

Replacement in pijul/src/remote/mod.rs at line 68 [6.52474]

B:BD[7.305] → [7.305:341]

B:BD[7.341] → [8.2649:2706]

    if name.starts_with("ssh://") {
        return if let Some(mut ssh) = ssh_remote(name) {

[7.305]

[6.54008]

    if location.starts_with("ssh://") {
        return if let Some(mut ssh) = ssh_remote(location) {

Replacement in pijul/src/remote/mod.rs at line 74 [6.52474]

B:BD[6.54188] → [6.54188:54230]

                remote: name.to_string(),

[6.54188]

[6.54230]

                remote: location.to_string(),

Replacement in pijul/src/remote/mod.rs at line 79 [6.52474]

B:BD[7.412] → [7.412:464]

    if let Ok(root) = std::fs::canonicalize(name) {

[7.412]

[7.464]

    if let Ok(root) = std::fs::canonicalize(location) {

Deletion in pijul/src/remote/mod.rs at line 86 [6.52474]
B:BD[6.54276] → [7.676:677]
Deletion in pijul/src/remote/mod.rs at line 88 [6.52474]
B:BD[6.54399] → [6.54399:54400]
Replacement in pijul/src/remote/mod.rs at line 96 [6.52474]
∅:D[9.10431] → [6.54745:54798]
B:BD[6.54745] → [6.54745:54798]
```
                root: Path::new(name).to_path_buf(),
```
[9.10431]
[6.54798]
```
                root: Path::new(location).to_path_buf(),
```
Replacement in pijul/src/remote/mod.rs at line 101 [6.52474]
B:BD[6.55181] → [8.2707:2753]
```
    if let Some(mut ssh) = ssh_remote(name) {
```
[6.55181]
[7.833]
```
    if let Some(mut ssh) = ssh_remote(location) {
```

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

B:BD[7.997] → [7.997:1035]

            remote: name.to_string(),

[7.997]

[7.1035]

            remote: location.to_string(),

Replacement in pijul/src/config.rs at line 55 [6.89866]
∅:D[2.22] → [6.91124:91166]
B:BD[6.91124] → [6.91124:91166]
```
    pub remotes: HashMap<String, String>,
```
[2.22]
[2.23]
```
    pub remotes: HashMap<String, RemoteEntry>,
```

Insertion in pijul/src/config.rs at line 61 [6.89866]

[6.91249]

pub struct RemoteEntry {
    pub url: String,
    pub pushurl: Option<String>,
}
#[derive(Debug, Serialize, Deserialize, Default)]

Insertion in pijul/src/config.rs at line 89 [6.89866]

[6.91619]

    }
}
impl RemoteEntry {
    pub fn get_push<'a>(&'a self) -> &'a String {
        return if let Some(ref push) = self.pushurl {
            push
        } else {
            &self.url
        };

Insertion in pijul/src/commands/pushpull.rs at line 76 [6.111631]

[6.113458]

[10.1333]

    /// When present, use a configured remote
    #[clap(long = "remote")]
    remote: bool,

Insertion in pijul/src/commands/pushpull.rs at line 109 [6.111631]

[11.302]

[12.2405]

    /// When present, use a configured remote
    #[clap(long = "remote")]
    remote: bool,

Deletion in pijul/src/commands/pushpull.rs at line 130 [6.111631]

∅:D[4.224] → [6.114690:114865]

B:BD[6.114690] → [6.114690:114865]

B:BD[6.114865] → [5.6916:6953]

∅:D[5.6953] → [6.114925:114936]

B:BD[6.114925] → [6.114925:114936]

        let remote_name = if let Some(ref rem) = self.to {
            rem
        } else if let Some(ref def) = repo.config.default_remote {
            def
        } else {
            bail!("Missing remote");
        };

Replacement in pijul/src/commands/pushpull.rs at line 144 [6.111631]

B:BD[6.115437] → [6.115437:115467]

B:BD[6.115467] → [7.4330:4351]

        let mut remote = repo
            .remote(

[6.115437]

[7.4351]

        let mut remote = if self.remote {
            let remote_entry = if let Some(ref rem) = self.to {
                let temp = repo.config.remotes.get(rem);
                if let Some(entry) = temp {
                    entry
                } else {
                    bail!("Missing remote {:?}", rem)
                }
            } else if let Some(ref rem) = repo.config.default_remote {
                let temp = repo.config.remotes.get(rem);
                if let Some(entry) = temp {
                    entry
                } else {
                    bail!("Missing default remote {:?}", rem)
                }
            } else {
                bail!("No default remote configured");
            };
            repo.remote(

Replacement in pijul/src/commands/pushpull.rs at line 164 [6.111631]

B:BD[7.4385] → [7.4385:4415]

                &remote_name,

[7.4385]

[7.4415]

                &remote_entry.url,
                &remote_entry.get_push(),

Replacement in pijul/src/commands/pushpull.rs at line 169 [6.111631]

∅:D[7.4497] → [6.115537:115558]

B:BD[6.115537] → [6.115537:115558]

            .await?;

[7.4497]

[6.115558]

            .await?
        } else if let Some(ref rem) = self.to {
            repo.remote(
                Some(&repo.path),
                rem,
                rem,
                remote_channel,
                self.no_cert_check,
            )
            .await?
        } else {
            let rem = if let Some(s) = repo.path.to_str() {
                s
            } else {
                bail!("Invalid path")
            };
            repo.remote(
                Some(&repo.path),
                &rem,
                &rem,
                remote_channel,
                self.no_cert_check,
            )
            .await?
        };

Deletion in pijul/src/commands/pushpull.rs at line 320 [6.111631]

B:BD[6.117890] → [6.117890:118067]

B:BD[6.118067] → [5.8409:8445]

∅:D[5.8445] → [6.118127:118138]

B:BD[6.118127] → [6.118127:118138]

        let remote_name = if let Some(ref rem) = self.from {
            rem
        } else if let Some(ref def) = repo.config.default_remote {
            def
        } else {
            bail!("Missing remote")
        };

Replacement in pijul/src/commands/pushpull.rs at line 325 [6.111631]

B:BD[6.118283] → [6.118283:118313]

B:BD[6.118313] → [7.5956:5977]

        let mut remote = repo
            .remote(

[6.118283]

[7.5977]

        let mut remote = if self.remote {
            let remote_entry = if let Some(ref rem) = self.from {
                let temp = repo.config.remotes.get(rem);
                if let Some(entry) = temp {
                    entry
                } else {
                    bail!("Missing remote {:?}", rem)
                }
            } else if let Some(ref rem) = repo.config.default_remote {
                let temp = repo.config.remotes.get(rem);
                if let Some(entry) = temp {
                    entry
                } else {
                    bail!("Missing default remote {:?}", rem)
                }
            } else {
                bail!("No default remote configured");
            };
            repo.remote(

Replacement in pijul/src/commands/pushpull.rs at line 345 [6.111631]

B:BD[7.6011] → [7.6011:6041]

                &remote_name,

[7.6011]

[7.6041]

                &remote_entry.url,
                &remote_entry.url,

Replacement in pijul/src/commands/pushpull.rs at line 350 [6.111631]

∅:D[7.6121] → [6.118381:118402]

B:BD[6.118381] → [6.118381:118402]

            .await?;

[7.6121]

[6.118402]

            .await?
        } else if let Some(ref rem) = self.from {
            repo.remote(Some(&repo.path), rem, rem, from_channel, self.no_cert_check)
                .await?
        } else {
            let rem = if let Some(s) = repo.path.to_str() {
                s
            } else {
                bail!("Invalid path")
            };
            repo.remote(
                Some(&repo.path),
                &rem,
                &rem,
                from_channel,
                self.no_cert_check,
            )
            .await?
        };

Insertion in pijul/src/commands/clone.rs at line 9 [6.182891]
[13.2960]
[13.2960]
```
use crate::config::RemoteEntry;
```

Replacement in pijul/src/commands/clone.rs at line 32 [6.182891]

B:BD[6.183750] → [12.5044:5070]

∅:D[12.5070] → [6.183750:183770]

B:BD[6.183750] → [6.183750:183770]

    /// Clone this remote
    remote: String,

[6.183750]

[14.3437]

    /// The name for the remote
    #[clap(long)]
    remote: Option<String>,
    /// Clone this path or URL
    source: String,

Replacement in pijul/src/commands/clone.rs at line 44 [6.182891]

B:BD[6.183871] → [6.183871:183896]

B:BD[6.183896] → [7.8109:8231]

        let mut remote =
            crate::remote::unknown_remote(None, &self.remote, &self.channel, self.no_cert_check)
                .await?;

[6.183871]

[6.183995]

        let mut remote = crate::remote::unknown_remote(
            None,
            &self.source,
            &self.source,
            &self.channel,
            self.no_cert_check,
        )
        .await?;

Replacement in pijul/src/commands/clone.rs at line 66 [6.182891]

B:BD[6.184404] → [6.184404:184502]

            return Err((crate::Error::CouldNotInferRepositoryName { repo: self.remote }).into());

[6.184404]

[6.184502]

            return Err((crate::Error::CouldNotInferRepositoryName { repo: self.source }).into());

Replacement in pijul/src/commands/clone.rs at line 115 [6.182891]

B:BD[6.185859] → [3.0:56]

        repo.config.default_remote = Some(self.remote);

[6.185859]

        if let Some(ref rem) = self.remote {
            repo.config.default_remote = Some(rem.clone());
            repo.config.remotes.insert(
                rem.clone(),
                RemoteEntry {
                    url: self.source,
                    pushurl: None,
                },
            );
        }

Insertion in pijul/src/commands/archive.rs at line 55 [6.191083]
[6.192302]
[6.192302]
```
                rem,
```