pijul/pijul - Change 74AO75NC2QLA3CIKOSODATGAAKIXHOJ6Q4PTLMVA6UNMISOSKT4QC

Refactor pijul::config into a separate crate

The crate itself will probably need a refactoring of its own at some point, but this should be a good start.

Created by finchie on June 15, 2023

74AO75NC2QLA3CIKOSODATGAAKIXHOJ6Q4PTLMVA6UNMISOSKT4QC

Dependencies

In discussions

#804 Split Pijul CLI into multiple sub-crates

Change contents

File addition: pijul-config (d--x------)
[6.2]
File addition: src (d--x------)
[0.24]
File move: config.rs → lib.rs
BF:BFD[7.21414] → [8.158:169]
BF:BF[8.169] → [7.89866:89866]
[0.41]
[7.89866]

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

[0.24]

[package]
name = "pijul-config"
description = "Configuration for the pijul version control system"
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"] }
dialoguer = { version = "0.10.4", default-features = false, features = ["editor"] }
dirs-next = "2.0.0"
log = "0.4.19"
serde = { version = "1.0.164", features = ["derive"] }
serde_derive = "1.0.164"
toml = { version = "0.7.4", features = ["preserve_order"] }
whoami = { version = "1.4.0", default-features = false }

Replacement in pijul/src/repository.rs at line 3 [7.21431]
B:BD[7.21541] → [9.5718:5752]
```
use crate::{config, current_dir};
```
[7.21541]
[10.7666]
```
use crate::current_dir;
use pijul_config as config;
```

Replacement in pijul/src/repository.rs at line 218 [7.21431]

B:BD[11.984] → [2.144:209]

        if let Ok((config, _)) = crate::config::Global::load() {

[11.984]

[2.209]

        if let Ok((config, _)) = pijul_config::Global::load() {

Replacement in pijul/src/remote/ssh.rs at line 246 [7.25380]

B:BD[12.1319] → [12.1319:1371]

                        crate::config::load_theme()

[12.1319]

[12.1371]

                        pijul_config::load_theme()

Replacement in pijul/src/remote/ssh.rs at line 302 [7.25380]

B:BD[13.2983] → [13.2983:3027]

                crate::config::load_theme()

[13.2983]

[13.3027]

                pijul_config::load_theme()

Insertion in pijul/src/remote/mod.rs at line 7 [7.52474]
[14.29]
[15.363]
```
use async_trait::async_trait;
```
Deletion in pijul/src/remote/mod.rs at line 17 [7.52474]
B:BD[16.457] → [17.0:22]
```
use crate::config::*;
```
Insertion in pijul/src/remote/mod.rs at line 18 [7.52474]
[16.483]
[5.3206]
```
use pijul_config::*;
```

Replacement in pijul/src/remote/mod.rs at line 63 [7.52474]

B:BD[7.53370] → [18.205:225]

impl RemoteConfig {

[7.53370]

[18.225]

#[async_trait]
pub trait RemoteConfigTrait {
    async fn to_remote(
        &self,
        channel: &str,
        no_cert_check: bool,
        with_path: bool,
    ) -> Result<RemoteRepo, anyhow::Error>;
}
#[async_trait]
impl RemoteConfigTrait for RemoteConfig {

Deletion in pijul/src/main.rs at line 2 [7.83981]
B:BD[7.84222] → [7.84222:84234]
```
mod config;
```
Replacement in pijul/src/identity/repair.rs at line 2 [20.56]
∅:D[19.364] → [20.171:190]
B:BD[20.171] → [20.171:190]
```
use crate::config;
```
[19.364]
[20.190]
```
use pijul_config as config;
```
Replacement in pijul/src/identity/mod.rs at line 46 [20.15627]
B:BD[20.17102] → [20.17102:17121]
B:BD[20.17121] → [19.1970:1997]
```
use crate::config;
use crate::config::Author;
```
[20.17102]
[20.17142]
```
use pijul_config as config;
use pijul_config::Author;
```
Replacement in pijul/src/identity/load.rs at line 3 [20.22387]
B:BD[20.22467] → [20.22467:22486]
```
use crate::config;
```
[20.22467]
[20.22507]
```
use pijul_config as config;
```
Insertion in pijul/src/identity/create.rs at line 4 [20.28175]
[20.28326]
[20.28347]
```
use pijul_config as config;
```
Deletion in pijul/src/identity/create.rs at line 409 [20.28175]
∅:D[19.8674] → [20.28242:28261]
B:BD[20.28242] → [20.28242:28261]
```
use crate::config;
```
Solving an order conflict in pijul/src/identity/create.rs at line 409 [20.28175]
[20.40788]

Replacement in pijul/src/commands/unrecord.rs at line 63 [7.95630]

B:BD[21.2745] → [22.13401:13464]

                let (cfg, _) = crate::config::Global::load()?;

[21.2745]

[23.2936]

                let (cfg, _) = pijul_config::Global::load()?;

Replacement in pijul/src/commands/unrecord.rs at line 80 [7.95630]

B:BD[23.3620] → [24.752:846]

            for h in parse_changelist(&crate::config::edit_bytes(&o[..])?, &hashes_).iter() {

[23.3620]

[25.26279]

            for h in parse_changelist(&pijul_config::edit_bytes(&o[..])?, &hashes_).iter() {

Replacement in pijul/src/commands/tag.rs at line 280 [26.74]

B:BD[22.13668] → [13.161:229]

    } else if let Some(_dir) = crate::config::global_config_dir() {

[22.13668]

[13.229]

    } else if let Some(_dir) = pijul_config::global_config_dir() {

Replacement in pijul/src/commands/tag.rs at line 301 [26.74]

B:BD[27.103] → [24.847:900]

            let bytes = crate::config::edit(&toml)?;

[27.103]

[28.376]

            let bytes = pijul_config::edit(&toml)?;

Replacement in pijul/src/commands/record.rs at line 217 [7.101759]
∅:D[13.796] → [29.293:345]
B:BD[29.293] → [29.293:345]
```
        let config = crate::config::Global::load();
```
[13.796]
[30.2059]
```
        let config = pijul_config::Global::load();
```

Replacement in pijul/src/commands/record.rs at line 419 [7.101759]

B:BD[7.108465] → [24.1082:1142]

                    crate::config::edit_toml_bytes(&o[..])?

[7.108465]

[7.108511]

                    pijul_config::edit_toml_bytes(&o[..])?

Replacement in pijul/src/commands/record.rs at line 421 [7.101759]

B:BD[7.108536] → [24.1143:1203]

                    crate::config::edit_toml_bytes(&o[..])?

[7.108536]

[7.108582]

                    pijul_config::edit_toml_bytes(&o[..])?

Replacement in pijul/src/commands/pushpull.rs at line 299 [7.111631]

B:BD[31.88] → [24.1204:1295]

                let d = parse_changelist(&crate::config::edit_bytes(&o[..])?, &to_upload);

[31.88]

[32.16]

                let d = parse_changelist(&pijul_config::edit_bytes(&o[..])?, &to_upload);

Replacement in pijul/src/commands/pushpull.rs at line 444 [7.111631]

B:BD[33.71] → [24.1296:1389]

                let d = parse_changelist(&crate::config::edit_bytes(&o[..])?, &to_download);

[33.71]

[32.91]

                let d = parse_changelist(&pijul_config::edit_bytes(&o[..])?, &to_download);

Replacement in pijul/src/commands/pushpull.rs at line 661 [7.111631]

B:BD[34.23151] → [24.1390:1448]

        if let Err(e) = crate::config::edit(s.as_str()) {

[34.23151]

[34.23200]

        if let Err(e) = pijul_config::edit(s.as_str()) {

Replacement in pijul/src/commands/pushpull.rs at line 691 [7.111631]

B:BD[34.24110] → [24.1449:1507]

        if let Err(e) = crate::config::edit(s.as_str()) {

[34.24110]

[34.24159]

        if let Err(e) = pijul_config::edit(s.as_str()) {

Replacement in pijul/src/commands/mod.rs at line 135 [7.133619]

B:BD[35.13] → [3.408:546]

fn pager(repo_config_pager: Option<&crate::config::Choice>) -> bool {
    if let Some(crate::config::Choice::Never) = repo_config_pager {

[35.13]

[3.546]

fn pager(repo_config_pager: Option<&pijul_config::Choice>) -> bool {
    if let Some(pijul_config::Choice::Never) = repo_config_pager {

Replacement in pijul/src/commands/mod.rs at line 138 [7.133619]

B:BD[3.568] → [3.568:653]

    } else if let Some(crate::config::Choice::Never) = crate::config::Global::load()

[3.568]

[3.653]

    } else if let Some(pijul_config::Choice::Never) = pijul_config::Global::load()

Replacement in pijul/src/commands/mod.rs at line 177 [7.133619]

B:BD[35.599] → [4.0:71]

fn pager(_repo_config_pager: Option<&crate::config::Choice>) -> bool {

[35.599]

[36.192]

fn pager(_repo_config_pager: Option<&pijul_config::Choice>) -> bool {

Deletion in pijul/src/commands/identity.rs at line 1 [20.40825]
B:BD[20.40825] → [20.40826:40839]
B:BD[20.40839] → [19.16782:16880]
∅:D[19.16880] → [20.40929:40933]
B:BD[20.40929] → [20.40929:40933]
```
use crate::{
    config::{self, Author},
    identity::{self, choose_identity_name, fix_identities, Complete},
};
```

Insertion in pijul/src/commands/identity.rs at line 2 [20.40825]

[19.16901]

[20.40973]


use crate::identity::{self, choose_identity_name, fix_identities, Complete};
use pijul_config::{self as config, Author};

Replacement in pijul/src/commands/diff.rs at line 351 [7.173551]

B:BD[37.400] → [3.2762:2841]

pub fn is_colored(repo_config_pager: Option<&crate::config::Choice>) -> bool {

[37.400]

[37.430]

pub fn is_colored(repo_config_pager: Option<&pijul_config::Choice>) -> bool {

Replacement in pijul/src/commands/diff.rs at line 353 [7.173551]

B:BD[37.483] → [22.24071:24132]

    if let Ok((global, _)) = crate::config::Global::load() {

[37.483]

[37.539]

    if let Ok((global, _)) = pijul_config::Global::load() {

Replacement in pijul/src/commands/diff.rs at line 355 [7.173551]

B:BD[37.569] → [37.569:701]

            Some(crate::config::Choice::Always) => colors = true,
            Some(crate::config::Choice::Never) => colors = false,

[37.569]

[37.701]

            Some(pijul_config::Choice::Always) => colors = true,
            Some(pijul_config::Choice::Never) => colors = false,

Replacement in pijul/src/commands/diff.rs at line 360 [7.173551]

B:BD[37.760] → [37.760:826]

            Some(crate::config::Choice::Never) => colors = false,

[37.760]

[37.826]

            Some(pijul_config::Choice::Never) => colors = false,

Insertion in pijul/src/commands/clone.rs at line 4 [7.182891]
[10.18573]
[10.18573]
```
use pijul_term::progress::{Spinner, OUTPUT_MESSAGE};
```
Insertion in pijul/src/commands/clone.rs at line 110 [7.182891]
[23.22558]
[38.3759]
```
        let output_spinner = Spinner::new(OUTPUT_MESSAGE)?;
```
Insertion in pijul/src/commands/clone.rs at line 150 [7.182891]
[39.314]
[7.185940]
```
        output_spinner.finish()?;
```
Replacement in pijul/src/commands/client.rs at line 9 [40.4568]
B:BD[40.4792] → [40.4792:4830]
```
use crate::config::global_config_dir;
```
[40.4792]
[40.4830]
```
use pijul_config::global_config_dir;
```

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

[5.8347]

[41.309]

pijul-config = { path = "../pijul-config" }
async-trait = "0.1.68"

Replacement in Cargo.toml at line 2 [7.1030188]

B:BD[7.1030201] → [5.8348:8412]

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

[7.1030201]

[42.315972]

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

Insertion in Cargo.lock at line 2203 [43.35]
[43.48080]
[43.48080]
```
 "async-trait",
```
Insertion in Cargo.lock at line 2232 [43.35]
[28.7238]
[5.8964]
```
 "pijul-config",
```

Insertion in Cargo.lock at line 2258 [43.35]

[43.48771]

name = "pijul-config"
version = "0.0.1"
dependencies = [
 "anyhow",
 "dialoguer",
 "dirs-next",
 "log",
 "serde",
 "serde_derive",
 "toml 0.7.4",
 "whoami",
]
[[package]]

Refactor pijul::config into a separate crate

Dependencies

In discussions

Change contents

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

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

File move: config.rs → lib.rs

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

Replacement in pijul/src/repository.rs at line 3 [7.21431]

Replacement in pijul/src/repository.rs at line 218 [7.21431]

Replacement in pijul/src/remote/ssh.rs at line 246 [7.25380]

Replacement in pijul/src/remote/ssh.rs at line 302 [7.25380]

Insertion in pijul/src/remote/mod.rs at line 7 [7.52474]

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

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

Replacement in pijul/src/remote/mod.rs at line 63 [7.52474]

Deletion in pijul/src/main.rs at line 2 [7.83981]

Replacement in pijul/src/identity/repair.rs at line 2 [20.56]

Replacement in pijul/src/identity/mod.rs at line 46 [20.15627]

Replacement in pijul/src/identity/load.rs at line 3 [20.22387]

Insertion in pijul/src/identity/create.rs at line 4 [20.28175]

Deletion in pijul/src/identity/create.rs at line 409 [20.28175]

Solving an order conflict in pijul/src/identity/create.rs at line 409 [20.28175]