pijul/pijul - Change CRQRKNFZMUM3LJQU2CG63JYLFI7WGP6HWQTTBVSK6YQKBK37LLBAC

Refactor crate::repository into separate crate

This is probably going to be the single most useful stand-alone crate for anyone interacting with a pijul repository

Created by finchie on June 15, 2023

CRQRKNFZMUM3LJQU2CG63JYLFI7WGP6HWQTTBVSK6YQKBK37LLBAC

Dependencies

In discussions

#804 Split Pijul CLI into multiple sub-crates

Change contents

File addition: pijul-repository (d--x------)
[9.2]
File addition: src (d--x------)
[0.28]
File move: repository.rs → lib.rs
BF:BFD[10.21414] → [11.84:99]
BF:BF[11.99] → [10.21431:21431]
[0.45]
[10.21431]

File addition: Cargo.toml (----------)

[0.28]

[package]
name = "pijul-repository"
description = "Functionality for interacting with a pijul repository"
version = "0.0.1"
authors = ["Pierre-Étienne Meunier <pe@pijul.org>"]
edition = "2018"
repository = "https://nest.pijul.com/pijul/pijul"
license = "GPL-2.0"
include = [ "Cargo.toml", "src" ]
[dependencies]
anyhow = { version = "1.0.71", features = ["backtrace"] }
log = "0.4.19"
libpijul = { path = "../libpijul" }
pijul-config = { path = "../pijul-config" }
pijul-term = { path = "../pijul-term" }
rlimit = "0.9.1"
toml = { version = "0.7.4", features = ["preserve_order"] }

Deletion in pijul/src/remote/mod.rs at line 17 [10.52474]
∅:D[12.22] → [13.457:483]
B:BD[13.457] → [13.457:483]
```
use crate::repository::*;
```
Insertion in pijul/src/remote/mod.rs at line 18 [10.52474]
[8.1046]
[14.3206]
```
use pijul_repository::*;
```

Replacement in pijul/src/remote/mod.rs at line 44 [10.52474]

B:BD[10.52973] → [10.52973:53031]

B:BD[10.53031] → [15.27:61]

B:BD[15.61] → [16.249:356]

∅:D[15.61] → [10.53031:53074]

∅:D[16.356] → [10.53031:53074]

B:BD[10.53031] → [10.53031:53074]

∅:D[12.53] → [10.53074:53103]

B:BD[10.53074] → [10.53074:53103]

B:BD[10.53103] → [17.5984:6009]

∅:D[17.6009] → [10.53103:53148]

B:BD[10.53103] → [10.53103:53148]

B:BD[10.53148] → [18.0:84]

B:BD[18.84] → [18.84:152]

∅:D[15.136] → [10.53271:53288]

∅:D[18.204] → [10.53271:53288]

∅:D[12.267] → [10.53271:53288]

∅:D[17.6095] → [10.53271:53288]

B:BD[10.53271] → [10.53271:53288]

B:BD[10.53288] → [16.357:448]

∅:D[15.211] → [10.53351:53361]

∅:D[16.448] → [10.53351:53361]

∅:D[17.6181] → [10.53351:53361]

B:BD[10.53351] → [10.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
        }

[10.52851]

[10.53361]

pub async fn remote_repository(
    remote: &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) = remote.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 991 [10.52474]

B:BD[19.764] → [20.219:272]

                    crate::repository::max_files()?,

[19.764]

[19.816]

                    pijul_repository::max_files()?,

Replacement in pijul/src/remote/mod.rs at line 1075 [10.52474]

B:BD[19.952] → [20.273:326]

                    crate::repository::max_files()?,

[19.952]

[19.1004]

                    pijul_repository::max_files()?,

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

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

B:BD[19.1126] → [20.586:631]

            crate::repository::max_files()?,

[19.1126]

[19.1170]

            pijul_repository::max_files()?,

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

B:BD[19.1284] → [20.632:677]

            crate::repository::max_files()?,

[19.1284]

[19.1328]

            pijul_repository::max_files()?,

Deletion in pijul/src/main.rs at line 4 [10.83981]
B:BD[10.84246] → [10.84246:84262]
```
mod repository;
```
Replacement in pijul/src/identity/create.rs at line 3 [21.28175]
B:BD[21.28291] → [21.28291:28326]
```
use crate::repository::Repository;
```
[22.8674]
[8.1426]
```
use crate::remote::remote_repository;
```
Insertion in pijul/src/identity/create.rs at line 5 [21.28175]
[8.1454]
[21.28347]
```
use pijul_repository::Repository;
```
Replacement in pijul/src/identity/create.rs at line 315 [21.28175]
B:BD[21.37291] → [23.3759:3784]
```
            repo.remote(
```
[21.37291]
[23.3784]
```
            remote_repository(
                &repo,
```
Deletion in pijul/src/commands/unrecord.rs at line 5 [10.95630]
B:BD[24.26180] → [24.26180:26215]
```
use crate::repository::Repository;
```
Insertion in pijul/src/commands/unrecord.rs at line 10 [10.95630]
[13.1251]
[10.95785]
```
use pijul_repository::Repository;
```
Deletion in pijul/src/commands/tag.rs at line 5 [26.74]
∅:D[25.50] → [26.150:185]
∅:D[4.53] → [26.150:185]
B:BD[26.150] → [26.150:185]
```
use crate::repository::Repository;
```
Insertion in pijul/src/commands/tag.rs at line 10 [26.74]
[27.12]
[26.332]
```
use pijul_repository::Repository;
```
Replacement in pijul/src/commands/reset.rs at line 11 [10.97650]
∅:D[28.4179] → [13.1348:1383]
B:BD[13.1348] → [13.1348:1383]
```
use crate::repository::Repository;
```
[13.1348]
[14.7496]
```
use pijul_repository::Repository;
```
Replacement in pijul/src/commands/record.rs at line 17 [10.101759]
B:BD[10.102093] → [13.1574:1600]
```
use crate::repository::*;
```
[10.102093]
[13.1618]
```
use pijul_repository::*;
```
Replacement in pijul/src/commands/pushpull.rs at line 16 [10.111631]
B:BD[28.4805] → [24.26960:27021]
∅:D[28.4805] → [13.1761:1796]
∅:D[29.18574] → [13.1761:1796]
∅:D[24.27021] → [13.1761:1796]
B:BD[13.1761] → [13.1761:1796]
```
use crate::remote::{PushDelta, RemoteDelta, RemoteRepo, CS};
use crate::repository::Repository;
```
[13.1761]
[14.7786]
```
use crate::remote::{remote_repository, PushDelta, RemoteDelta, RemoteRepo, CS};
use pijul_repository::Repository;
```

Replacement in pijul/src/commands/pushpull.rs at line 216 [10.111631]

B:BD[10.115437] → [10.115437:115467]

B:BD[10.115467] → [15.4330:4385]

B:BD[15.4385] → [16.927:949]

∅:D[16.949] → [15.4385:4447]

B:BD[15.4385] → [15.4385:4447]

∅:D[12.2464] → [15.4447:4483]

B:BD[15.4447] → [15.4447:4483]

B:BD[15.4483] → [17.15286:15308]

∅:D[17.15308] → [15.4483:4497]

B:BD[15.4483] → [15.4483:4497]

∅:D[15.4497] → [10.115537:115558]

B:BD[10.115537] → [10.115537:115558]

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

[10.115437]

[29.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 401 [10.111631]

B:BD[10.118283] → [10.118283:118313]

B:BD[10.118313] → [15.5956:6011]

B:BD[15.6011] → [16.950:972]

∅:D[16.972] → [15.6011:6071]

B:BD[15.6011] → [15.6011:6071]

∅:D[12.2498] → [15.6071:6107]

B:BD[15.6071] → [15.6071:6107]

B:BD[15.6107] → [17.15373:15395]

∅:D[17.15395] → [15.6107:6121]

B:BD[15.6107] → [15.6107:6121]

∅:D[15.6121] → [10.118381:118402]

B:BD[10.118381] → [10.118381:118402]

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

[10.118283]

[10.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 [10.123281]
B:BD[13.1914] → [30.15078:15113]
```
use crate::repository::Repository;
```
Insertion in pijul/src/commands/protocol.rs at line 12 [10.123281]
[31.1145]
[10.123476]
```
use pijul_repository::Repository;
```
Replacement in pijul/src/commands/mod.rs at line 79 [10.133619]
∅:D[32.18771] → [33.1801:1847]
B:BD[33.1801] → [33.1801:1847]
```
    repo: &mut crate::repository::Repository,
```
[32.18771]
[33.1847]
```
    repo: &mut pijul_repository::Repository,
```
Deletion in pijul/src/commands/log.rs at line 7 [10.134376]
B:BD[13.2088] → [34.103:138]
```
use crate::repository::Repository;
```
Insertion in pijul/src/commands/log.rs at line 15 [10.134376]
[35.242]
[34.225]
```
use pijul_repository::Repository;
```

Replacement in pijul/src/commands/log.rs at line 321 [10.134376]

B:BD[36.410] → [36.410:507]

        let mut reverse_log = self.txn.reverse_log(&*self.channel_ref.read(), None)?.peekable();

[36.410]

[36.507]

        let mut reverse_log = self
            .txn
            .reverse_log(&*self.channel_ref.read(), None)?
            .peekable();

Replacement in pijul/src/commands/log.rs at line 443 [10.134376]

B:BD[34.13977] → [2.27:115]

            description: if self.cmd.descriptions { header.description } else { None },

[34.13977]

[34.14022]

            description: if self.cmd.descriptions {
                header.description
            } else {
                None
            },

Replacement in pijul/src/commands/log.rs at line 471 [10.134376]

B:BD[3.322] → [3.322:358]

∅:D[3.358] → [37.2380:2450]

B:BD[34.14431] → [37.2380:2450]

            OutputFormat::Json => {
                serde_json::to_writer_pretty(&mut stdout, &log_iter)?

[3.322]

[34.14521]

            OutputFormat::Json => serde_json::to_writer_pretty(&mut stdout, &log_iter)?,
            OutputFormat::Plaintext => {
                log_iter.for_each(|entry| match write!(&mut stdout, "{}", entry) {
                    Ok(_) => Ok(()),
                    Err(e) if e.kind() == std::io::ErrorKind::BrokenPipe => Ok(()),
                    Err(e) => Err(e),
                })?

Deletion in pijul/src/commands/log.rs at line 479 [10.134376]

B:BD[34.14535] → [3.359:465]

∅:D[3.465] → [37.2535:2699]

B:BD[37.2535] → [37.2535:2699]

            OutputFormat::Plaintext => log_iter.for_each(|entry| match write!(&mut stdout, "{}", entry) {
                Ok(_) => Ok(()),
                Err(e) if e.kind() == std::io::ErrorKind::BrokenPipe => Ok(()),
                Err(e) => Err(e),
            })?,

Replacement in pijul/src/commands/init.rs at line 6 [10.136543]
∅:D[13.2235] → [10.136544:136570]
B:BD[10.136543] → [10.136544:136570]
```
use crate::repository::*;
```
[13.2235]
[10.136627]
```
use pijul_repository::*;
```
Replacement in pijul/src/commands/git.rs at line 10 [10.137210]
B:BD[13.2282] → [13.2282:2308]
```
use crate::repository::*;
```
[13.2282]
[10.137436]
```
use pijul_repository::*;
```
Replacement in pijul/src/commands/fork.rs at line 7 [10.167873]
B:BD[13.2368] → [13.2368:2403]
```
use crate::repository::Repository;
```
[13.2368]
[10.168000]
```
use pijul_repository::Repository;
```
Replacement in pijul/src/commands/file_operations.rs at line 9 [10.169058]
B:BD[10.169209] → [13.2516:2551]
```
use crate::repository::Repository;
```
[10.169209]
[13.2551]
```
use pijul_repository::Repository;
```
Replacement in pijul/src/commands/diff.rs at line 11 [10.173551]
B:BD[10.173739] → [13.2684:2710]
```
use crate::repository::*;
```
[10.173739]
[13.2710]
```
use pijul_repository::*;
```
Deletion in pijul/src/commands/dependents.rs at line 1 [38.243]
B:BD[38.243] → [38.244:288]
```
use std::path::PathBuf;
use std::io::Write;
```
Insertion in pijul/src/commands/dependents.rs at line 3 [38.243]
[38.323]
[38.323]
```
use std::io::Write;
use std::path::PathBuf;
```
Replacement in pijul/src/commands/dependents.rs at line 6 [38.243]
B:BD[38.324] → [38.324:350]
```
use crate::repository::*;
```
[38.324]
[38.350]
```
use pijul_repository::*;
```
Replacement in pijul/src/commands/dependents.rs at line 37 [38.243]
B:BD[7.450] → [7.450:480]
```
                return Ok(())
```
[7.450]
[38.1076]
```
                return Ok(());
```

Replacement in pijul/src/commands/dependents.rs at line 65 [38.243]

B:BD[7.856] → [7.856:886]

                        break

[7.856]

[7.886]

                        break;

Deletion in pijul/src/commands/debug.rs at line 3 [10.177758]
∅:D[13.2754] → [10.177759:177794]
B:BD[10.177758] → [10.177759:177794]
```
use crate::repository::Repository;
```
Insertion in pijul/src/commands/debug.rs at line 6 [10.177758]
[39.31]
[10.177836]
```
use pijul_repository::Repository;
```

Replacement in pijul/src/commands/debug.rs at line 43 [10.177758]

B:BD[32.21392] → [32.21392:21427]

B:BD[32.21427] → [6.0:74]

                let (pos, _) = txn
                    .follow_oldest_path(&repo.changes, &channel, &root)?;

[32.21392]

[32.21530]

                let (pos, _) = txn.follow_oldest_path(&repo.changes, &channel, &root)?;

Replacement in pijul/src/commands/credit.rs at line 12 [10.178684]
B:BD[10.178930] → [13.2845:2880]
```
use crate::repository::Repository;
```
[10.178930]
[13.2898]
```
use pijul_repository::Repository;
```
Replacement in pijul/src/commands/clone.rs at line 3 [10.182891]
B:BD[13.2925] → [30.18547:18573]
```
use crate::repository::*;
```
[13.2925]
[8.2958]
```
use pijul_repository::*;
```
Deletion in pijul/src/commands/channel.rs at line 4 [10.186892]
B:BD[10.187014] → [40.6229:6264]
```
use crate::repository::Repository;
```
Insertion in pijul/src/commands/channel.rs at line 9 [10.186892]
[5.16]
[13.3080]
```
use pijul_repository::Repository;
```
Replacement in pijul/src/commands/change.rs at line 7 [10.189306]
B:BD[13.3125] → [13.3125:3151]
```
use crate::repository::*;
```
[13.3125]
[10.189470]
```
use pijul_repository::*;
```
Replacement in pijul/src/commands/archive.rs at line 8 [10.191083]
B:BD[10.191247] → [13.3269:3304]
```
use crate::repository::Repository;
```
[10.191247]
[13.3304]
```
use pijul_repository::Repository;
```
Replacement in pijul/src/commands/apply.rs at line 10 [10.194289]
∅:D[28.5104] → [13.3380:3415]
B:BD[13.3380] → [13.3380:3415]
```
use crate::repository::Repository;
```
[13.3380]
[14.8149]
```
use pijul_repository::Repository;
```
Insertion in pijul/Cargo.toml at line 114 [10.196374]
[8.3214]
[41.309]
```
pijul-repository = { path = "../pijul-repository" }
```

Replacement in Cargo.toml at line 2 [10.1030188]

B:BD[10.1030201] → [8.3215:3295]

members = [ "pijul-macros", "pijul", "libpijul", "pijul-term", "pijul-config" ]

[10.1030201]

[42.315972]

members = [ "pijul-macros", "pijul", "libpijul", "pijul-term", "pijul-config", "pijul-repository" ]

Insertion in Cargo.lock at line 2233 [43.35]
[8.3330]
[14.8964]
```
 "pijul-repository",
```

Insertion in Cargo.lock at line 2282 [43.35]

[14.8995]

name = "pijul-repository"
version = "0.0.1"
dependencies = [
 "anyhow",
 "libpijul",
 "log",
 "pijul-config",
 "pijul-term",
 "rlimit",
 "toml 0.7.4",
]
[[package]]

Refactor crate::repository into separate crate

Dependencies

In discussions

Change contents

File addition: pijul-repository (d--x------)

File addition: src (d--x------)

File move: repository.rs → lib.rs

File addition: Cargo.toml (----------)

Deletion in pijul/src/remote/mod.rs at line 17 [10.52474]

Insertion in pijul/src/remote/mod.rs at line 18 [10.52474]

Replacement in pijul/src/remote/mod.rs at line 44 [10.52474]

Replacement in pijul/src/remote/mod.rs at line 991 [10.52474]

Replacement in pijul/src/remote/mod.rs at line 1075 [10.52474]

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

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

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

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

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

Insertion in pijul/src/identity/create.rs at line 5 [21.28175]

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

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

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

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

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

Replacement in pijul/src/commands/reset.rs at line 11 [10.97650]

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

Replacement in pijul/src/commands/pushpull.rs at line 16 [10.111631]

Replacement in pijul/src/commands/pushpull.rs at line 216 [10.111631]

Replacement in pijul/src/commands/pushpull.rs at line 401 [10.111631]

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

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

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

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

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

Replacement in pijul/src/commands/log.rs at line 321 [10.134376]

Replacement in pijul/src/commands/log.rs at line 443 [10.134376]

Replacement in pijul/src/commands/log.rs at line 471 [10.134376]

Deletion in pijul/src/commands/log.rs at line 479 [10.134376]

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

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

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

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

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

Deletion in pijul/src/commands/dependents.rs at line 1 [38.243]

Insertion in pijul/src/commands/dependents.rs at line 3 [38.243]

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

Replacement in pijul/src/commands/dependents.rs at line 37 [38.243]

Replacement in pijul/src/commands/dependents.rs at line 65 [38.243]

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

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

Replacement in pijul/src/commands/debug.rs at line 43 [10.177758]

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

Replacement in pijul/src/commands/clone.rs at line 3 [10.182891]

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

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

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

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

Replacement in pijul/src/commands/apply.rs at line 10 [10.194289]

Insertion in pijul/Cargo.toml at line 114 [10.196374]

Replacement in Cargo.toml at line 2 [10.1030188]

Insertion in Cargo.lock at line 2233 [43.35]

Insertion in Cargo.lock at line 2282 [43.35]