pijul/pijul - Change ABQDWHNGSBF2REQDCGXSBFAU4RUMXYAF2KHJ5O3D32M7Z3A3FEDAC

Migrate from `pijul::repository` to `pijul-repository`

Fairly straightforward patch. Only change of note is that pijul::remote can no longer directly implement remote-finding on the Repository struct directly, so a new function has been exposed instead. There may be more ergonomic ways to solve this, but that is outside the scope of this patch.

Created by finchie on July 14, 2023

ABQDWHNGSBF2REQDCGXSBFAU4RUMXYAF2KHJ5O3D32M7Z3A3FEDAC

Dependencies

In channels

main

In discussions

#804 Split Pijul CLI into multiple sub-crates

#832 [DRAFT] refactor global configuration

Change contents

Deletion in pijul/src/remote/mod.rs at line 16 [9.52474]
∅:D[7.22] → [8.457:483]
B:BD[8.457] → [8.457:483]
```
use crate::repository::*;
```
Insertion in pijul/src/remote/mod.rs at line 17 [9.52474]
[5.267]
[9.52711]
```
use pijul_repository::*;
```

Replacement in pijul/src/remote/mod.rs at line 46 [9.52474]

B:BD[9.52973] → [9.52973:53031]

B:BD[9.53031] → [10.27:61]

B:BD[10.61] → [11.249:356]

∅:D[10.61] → [9.53031:53074]

∅:D[11.356] → [9.53031:53074]

B:BD[9.53031] → [9.53031:53074]

∅:D[7.53] → [9.53074:53103]

B:BD[9.53074] → [9.53074:53103]

B:BD[9.53103] → [12.5984:6009]

∅:D[12.6009] → [9.53103:53148]

B:BD[9.53103] → [9.53103:53148]

B:BD[9.53148] → [13.0:152]

∅:D[10.136] → [9.53271:53288]

∅:D[13.204] → [9.53271:53288]

∅:D[7.267] → [9.53271:53288]

∅:D[12.6095] → [9.53271:53288]

B:BD[9.53271] → [9.53271:53288]

B:BD[9.53288] → [11.357:448]

∅:D[10.211] → [9.53351:53361]

∅:D[11.448] → [9.53351:53361]

∅:D[12.6181] → [9.53351:53361]

B:BD[9.53351] → [9.53351:53361]

impl Repository {
    pub async fn remote(
        &self,
        self_path: Option<&Path>,
        // User name in case it isn't provided in the `name` argument already.
        user: Option<&str>,
        name: &str,
        channel: &str,
        no_cert_check: bool,
        with_path: bool,
    ) -> Result<RemoteRepo, anyhow::Error> {
        if let Some(name) = self.config.remotes.iter().find(|e| e.name() == name) {
            name.to_remote(channel, no_cert_check, with_path).await
        } else {
            unknown_remote(self_path, user, name, channel, no_cert_check, with_path).await
        }

[9.52851]

[9.53361]

pub async fn repository(
    repo: &Repository,
    self_path: Option<&Path>,
    // User name in case it isn't provided in the `name` argument already.
    user: Option<&str>,
    name: &str,
    channel: &str,
    no_cert_check: bool,
    with_path: bool,
) -> Result<RemoteRepo, anyhow::Error> {
    if let Some(name) = repo.config.remotes.iter().find(|e| e.name() == name) {
        name.to_remote(channel, no_cert_check, with_path).await
    } else {
        unknown_remote(self_path, user, name, channel, no_cert_check, with_path).await

Replacement in pijul/src/remote/mod.rs at line 993 [9.52474]

B:BD[14.764] → [4.264:317]

                    crate::repository::max_files()?,

[14.764]

[14.816]

                    pijul_repository::max_files()?,

Replacement in pijul/src/remote/mod.rs at line 1077 [9.52474]

B:BD[14.952] → [4.318:371]

                    crate::repository::max_files()?,

[14.952]

[14.1004]

                    pijul_repository::max_files()?,

Replacement in pijul/src/remote/mod.rs at line 1452 [9.52474]
B:BD[9.74849] → [9.74849:74895]
```
        repo: &crate::repository::Repository,
```
[9.74849]
[9.74895]
```
        repo: &pijul_repository::Repository,
```

Replacement in pijul/src/remote/local.rs at line 78 [9.79745]

B:BD[14.1126] → [4.372:417]

            crate::repository::max_files()?,

[14.1126]

[14.1170]

            pijul_repository::max_files()?,

Replacement in pijul/src/remote/local.rs at line 149 [9.79745]

B:BD[14.1284] → [4.418:463]

            crate::repository::max_files()?,

[14.1284]

[14.1328]

            pijul_repository::max_files()?,

Deletion in pijul/src/main.rs at line 4 [9.83981]
B:BD[9.84246] → [9.84246:84262]
```
mod repository;
```
Replacement in pijul/src/identity/create.rs at line 3 [15.28175]
B:BD[15.28291] → [15.28291:28326]
```
use crate::repository::Repository;
```
[16.8674]
[15.28347]
```
use crate::remote;
use pijul_repository::Repository;
```

Replacement in pijul/src/identity/create.rs at line 315 [15.28175]

B:BD[15.37291] → [17.3759:3784]

            repo.remote(

[15.37291]

[17.3784]

            remote::repository(
                &repo,

Deletion in pijul/src/commands/unrecord.rs at line 5 [9.95630]
B:BD[18.26180] → [18.26180:26215]
```
use crate::repository::Repository;
```
Insertion in pijul/src/commands/unrecord.rs at line 10 [9.95630]
[8.1251]
[9.95785]
```
use pijul_repository::Repository;
```
Deletion in pijul/src/commands/tag.rs at line 5 [20.74]
∅:D[19.50] → [20.150:185]
∅:D[2.53] → [20.150:185]
B:BD[20.150] → [20.150:185]
```
use crate::repository::Repository;
```
Insertion in pijul/src/commands/tag.rs at line 10 [20.74]
[21.12]
[20.332]
```
use pijul_repository::Repository;
```
Deletion in pijul/src/commands/reset.rs at line 11 [9.97650]
∅:D[22.4179] → [8.1348:1383]
B:BD[8.1348] → [8.1348:1383]
```
use crate::repository::Repository;
```
Insertion in pijul/src/commands/reset.rs at line 12 [9.97650]
[23.4213]
[9.97798]
```
use pijul_repository::Repository;
```
Replacement in pijul/src/commands/record.rs at line 17 [9.101759]
B:BD[9.102093] → [8.1574:1600]
```
use crate::repository::*;
```
[9.102093]
[8.1618]
```
use pijul_repository::*;
```
Replacement in pijul/src/commands/pushpull.rs at line 15 [9.111631]
B:BD[22.4805] → [18.26960:27021]
∅:D[22.4805] → [8.1761:1796]
∅:D[24.18574] → [8.1761:1796]
∅:D[18.27021] → [8.1761:1796]
B:BD[8.1761] → [8.1761:1796]
```
use crate::remote::{PushDelta, RemoteDelta, RemoteRepo, CS};
use crate::repository::Repository;
```
[8.1761]
[23.4346]
```
use crate::remote::{self, PushDelta, RemoteDelta, RemoteRepo, CS};
```
Insertion in pijul/src/commands/pushpull.rs at line 17 [9.111631]
[23.4434]
[9.111878]
```
use pijul_repository::Repository;
```

Replacement in pijul/src/commands/pushpull.rs at line 215 [9.111631]

B:BD[9.115437] → [9.115437:115467]

B:BD[9.115467] → [10.4330:4385]

B:BD[10.4385] → [11.927:949]

∅:D[11.949] → [10.4385:4447]

B:BD[10.4385] → [10.4385:4447]

∅:D[7.2464] → [10.4447:4483]

B:BD[10.4447] → [10.4447:4483]

B:BD[10.4483] → [12.15286:15308]

∅:D[12.15308] → [10.4483:4497]

B:BD[10.4483] → [10.4483:4497]

∅:D[10.4497] → [9.115537:115558]

B:BD[9.115537] → [9.115537:115558]

        let mut remote = repo
            .remote(
                Some(&repo.path),
                None,
                &remote_name,
                remote_channel,
                self.no_cert_check,
                true,
            )
            .await?;

[9.115437]

[24.20136]

        let mut remote = remote::repository(
            &repo,
            Some(&repo.path),
            None,
            &remote_name,
            remote_channel,
            self.no_cert_check,
            true,
        )
        .await?;

Replacement in pijul/src/commands/pushpull.rs at line 400 [9.111631]

B:BD[9.118283] → [9.118283:118313]

B:BD[9.118313] → [10.5956:6011]

B:BD[10.6011] → [11.950:972]

∅:D[11.972] → [10.6011:6071]

B:BD[10.6011] → [10.6011:6071]

∅:D[7.2498] → [10.6071:6107]

B:BD[10.6071] → [10.6071:6107]

B:BD[10.6107] → [12.15373:15395]

∅:D[12.15395] → [10.6107:6121]

B:BD[10.6107] → [10.6107:6121]

∅:D[10.6121] → [9.118381:118402]

B:BD[9.118381] → [9.118381:118402]

        let mut remote = repo
            .remote(
                Some(&repo.path),
                None,
                &remote_name,
                from_channel,
                self.no_cert_check,
                true,
            )
            .await?;

[9.118283]

[9.118402]

        let mut remote = remote::repository(
            &repo,
            Some(&repo.path),
            None,
            &remote_name,
            from_channel,
            self.no_cert_check,
            true,
        )
        .await?;

Deletion in pijul/src/commands/protocol.rs at line 6 [9.123281]
B:BD[8.1914] → [25.15078:15113]
```
use crate::repository::Repository;
```
Insertion in pijul/src/commands/protocol.rs at line 12 [9.123281]
[26.1145]
[9.123476]
```
use pijul_repository::Repository;
```
Replacement in pijul/src/commands/mod.rs at line 79 [9.133619]
∅:D[27.18771] → [28.1801:1847]
B:BD[28.1801] → [28.1801:1847]
```
    repo: &mut crate::repository::Repository,
```
[27.18771]
[28.1847]
```
    repo: &mut pijul_repository::Repository,
```
Deletion in pijul/src/commands/log.rs at line 7 [9.134376]
B:BD[8.2088] → [29.103:138]
```
use crate::repository::Repository;
```
Insertion in pijul/src/commands/log.rs at line 15 [9.134376]
[30.242]
[29.225]
```
use pijul_repository::Repository;
```
Replacement in pijul/src/commands/init.rs at line 6 [9.136543]
∅:D[8.2235] → [9.136544:136570]
B:BD[9.136543] → [9.136544:136570]
```
use crate::repository::*;
```
[8.2235]
[9.136627]
```
use pijul_repository::*;
```
Replacement in pijul/src/commands/git.rs at line 10 [9.137210]
B:BD[8.2282] → [8.2282:2308]
```
use crate::repository::*;
```
[8.2282]
[9.137436]
```
use pijul_repository::*;
```
Replacement in pijul/src/commands/fork.rs at line 7 [9.167873]
B:BD[8.2368] → [8.2368:2403]
```
use crate::repository::Repository;
```
[8.2368]
[9.168000]
```
use pijul_repository::Repository;
```
Replacement in pijul/src/commands/file_operations.rs at line 9 [9.169058]
B:BD[9.169209] → [8.2516:2551]
```
use crate::repository::Repository;
```
[9.169209]
[8.2551]
```
use pijul_repository::Repository;
```
Replacement in pijul/src/commands/diff.rs at line 11 [9.173551]
B:BD[9.173739] → [8.2684:2710]
```
use crate::repository::*;
```
[9.173739]
[8.2710]
```
use pijul_repository::*;
```
Replacement in pijul/src/commands/dependents.rs at line 6 [31.243]
B:BD[31.324] → [31.324:350]
```
use crate::repository::*;
```
[31.324]
[31.350]
```
use pijul_repository::*;
```
Deletion in pijul/src/commands/debug.rs at line 3 [9.177758]
∅:D[8.2754] → [9.177759:177794]
B:BD[9.177758] → [9.177759:177794]
```
use crate::repository::Repository;
```
Insertion in pijul/src/commands/debug.rs at line 6 [9.177758]
[32.31]
[9.177836]
```
use pijul_repository::Repository;
```
Replacement in pijul/src/commands/credit.rs at line 12 [9.178684]
B:BD[9.178930] → [8.2845:2880]
```
use crate::repository::Repository;
```
[9.178930]
[8.2898]
```
use pijul_repository::Repository;
```
Deletion in pijul/src/commands/clone.rs at line 3 [9.182891]
B:BD[8.2925] → [25.18547:18573]
```
use crate::repository::*;
```
Insertion in pijul/src/commands/clone.rs at line 7 [9.182891]
[8.2958]
[9.183024]
```
use pijul_repository::*;
```
Deletion in pijul/src/commands/channel.rs at line 4 [9.186892]
B:BD[9.187014] → [33.6229:6264]
```
use crate::repository::Repository;
```
Insertion in pijul/src/commands/channel.rs at line 9 [9.186892]
[3.16]
[8.3080]
```
use pijul_repository::Repository;
```
Replacement in pijul/src/commands/change.rs at line 7 [9.189306]
B:BD[8.3125] → [8.3125:3151]
```
use crate::repository::*;
```
[8.3125]
[9.189470]
```
use pijul_repository::*;
```
Replacement in pijul/src/commands/archive.rs at line 8 [9.191083]
B:BD[9.191247] → [8.3269:3304]
```
use crate::repository::Repository;
```
[9.191247]
[8.3304]
```
use pijul_repository::Repository;
```
Deletion in pijul/src/commands/apply.rs at line 10 [9.194289]
∅:D[22.5104] → [8.3380:3415]
B:BD[8.3380] → [8.3380:3415]
```
use crate::repository::Repository;
```
Insertion in pijul/src/commands/apply.rs at line 11 [9.194289]
[23.4752]
[9.194497]
```
use pijul_repository::Repository;
```
Deletion in pijul/Cargo.toml at line 101 [9.196374]
∅:D[34.381] → [14.1340:1355]
B:BD[35.1493] → [14.1340:1355]
```
rlimit = "0.6"
```
Insertion in pijul/Cargo.toml at line 112 [9.196374]
[23.4873]
[23.4873]
```
pijul-repository = { path = "../pijul-repository" }
```
Insertion in Cargo.lock at line 2210 [37.35]
[36.573]
[37.48476]
```
 "pijul-repository",
```
Deletion in Cargo.lock at line 2215 [37.35]
B:BD[37.48523] → [6.0:17]
```
 "rlimit 0.6.2",
```
Replacement in Cargo.lock at line 2274 [37.35]
B:BD[6.143] → [6.143:160]
```
 "rlimit 0.9.1",
```
[6.143]
[6.160]
```
 "rlimit",
```

Deletion in Cargo.lock at line 2580 [37.35]

B:BD[37.55608] → [37.55608:55769]

B:BD[37.55769] → [6.176:233]

version = "0.6.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc0bf25554376fd362f54332b8410a625c71f15445bca32ffdfdf4ec9ac91726"
dependencies = [
 "libc",
]
[[package]]
name = "rlimit"

Migrate from `pijul::repository` to `pijul-repository`

Dependencies

In channels

In discussions

Change contents

Deletion in pijul/src/remote/mod.rs at line 16 [9.52474]

Insertion in pijul/src/remote/mod.rs at line 17 [9.52474]

Replacement in pijul/src/remote/mod.rs at line 46 [9.52474]

Replacement in pijul/src/remote/mod.rs at line 993 [9.52474]

Replacement in pijul/src/remote/mod.rs at line 1077 [9.52474]

Replacement in pijul/src/remote/mod.rs at line 1452 [9.52474]

Replacement in pijul/src/remote/local.rs at line 78 [9.79745]

Replacement in pijul/src/remote/local.rs at line 149 [9.79745]

Deletion in pijul/src/main.rs at line 4 [9.83981]

Replacement in pijul/src/identity/create.rs at line 3 [15.28175]

Replacement in pijul/src/identity/create.rs at line 315 [15.28175]

Deletion in pijul/src/commands/unrecord.rs at line 5 [9.95630]

Insertion in pijul/src/commands/unrecord.rs at line 10 [9.95630]

Deletion in pijul/src/commands/tag.rs at line 5 [20.74]

Insertion in pijul/src/commands/tag.rs at line 10 [20.74]

Deletion in pijul/src/commands/reset.rs at line 11 [9.97650]

Insertion in pijul/src/commands/reset.rs at line 12 [9.97650]

Replacement in pijul/src/commands/record.rs at line 17 [9.101759]

Replacement in pijul/src/commands/pushpull.rs at line 15 [9.111631]

Insertion in pijul/src/commands/pushpull.rs at line 17 [9.111631]

Replacement in pijul/src/commands/pushpull.rs at line 215 [9.111631]

Replacement in pijul/src/commands/pushpull.rs at line 400 [9.111631]

Deletion in pijul/src/commands/protocol.rs at line 6 [9.123281]

Insertion in pijul/src/commands/protocol.rs at line 12 [9.123281]

Replacement in pijul/src/commands/mod.rs at line 79 [9.133619]

Deletion in pijul/src/commands/log.rs at line 7 [9.134376]

Insertion in pijul/src/commands/log.rs at line 15 [9.134376]

Replacement in pijul/src/commands/init.rs at line 6 [9.136543]

Replacement in pijul/src/commands/git.rs at line 10 [9.137210]

Replacement in pijul/src/commands/fork.rs at line 7 [9.167873]

Replacement in pijul/src/commands/file_operations.rs at line 9 [9.169058]

Replacement in pijul/src/commands/diff.rs at line 11 [9.173551]

Replacement in pijul/src/commands/dependents.rs at line 6 [31.243]

Deletion in pijul/src/commands/debug.rs at line 3 [9.177758]

Insertion in pijul/src/commands/debug.rs at line 6 [9.177758]

Replacement in pijul/src/commands/credit.rs at line 12 [9.178684]

Deletion in pijul/src/commands/clone.rs at line 3 [9.182891]

Insertion in pijul/src/commands/clone.rs at line 7 [9.182891]

Deletion in pijul/src/commands/channel.rs at line 4 [9.186892]

Insertion in pijul/src/commands/channel.rs at line 9 [9.186892]

Replacement in pijul/src/commands/change.rs at line 7 [9.189306]

Replacement in pijul/src/commands/archive.rs at line 8 [9.191083]

Deletion in pijul/src/commands/apply.rs at line 10 [9.194289]

Insertion in pijul/src/commands/apply.rs at line 11 [9.194289]

Deletion in pijul/Cargo.toml at line 101 [9.196374]

Insertion in pijul/Cargo.toml at line 112 [9.196374]

Insertion in Cargo.lock at line 2210 [37.35]

Deletion in Cargo.lock at line 2215 [37.35]

Replacement in Cargo.lock at line 2274 [37.35]

Deletion in Cargo.lock at line 2580 [37.35]