dblsaiko/pijul - Change 4RV7T4SRYIQLBW3EZFWBO5G65QAVG2GHPI4KMDDZERCX65KQWSPQC

Migrate from `pijul::config` to `pijul-config`

No surprises here, the only hunk of note is that async_trait was added as a dependency so that pijul::remote could implement to_remote for pijul_config::RemoteConfig.

Created by finchie on July 13, 2023

4RV7T4SRYIQLBW3EZFWBO5G65QAVG2GHPI4KMDDZERCX65KQWSPQC

Dependencies

In channels

main

Change contents

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

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

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

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

[10.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[11.1319] → [11.1319:1371]

                        crate::config::load_theme()

[11.1319]

[11.1371]

                        pijul_config::load_theme()

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

B:BD[12.2983] → [12.2983:3027]

                crate::config::load_theme()

[12.2983]

[12.3027]

                pijul_config::load_theme()

Insertion in pijul/src/remote/mod.rs at line 6 [7.52474]
[13.29]
[14.363]
```
use async_trait::async_trait;
```
Deletion in pijul/src/remote/mod.rs at line 16 [7.52474]
B:BD[15.457] → [16.0:22]
```
use crate::config::*;
```
Insertion in pijul/src/remote/mod.rs at line 17 [7.52474]
[15.483]
[7.52711]
```
use pijul_config::*;
```

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

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

impl RemoteConfig {

[7.53370]

[17.225]

#[async_trait]
pub trait ToRemote {
    async fn to_remote(
        &self,
        channel: &str,
        no_cert_check: bool,
        with_path: bool,
    ) -> Result<RemoteRepo, anyhow::Error>;
}
#[async_trait]
impl ToRemote 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 [19.56]
∅:D[18.364] → [19.171:190]
B:BD[19.171] → [19.171:190]
```
use crate::config;
```
[18.364]
[19.190]
```
use pijul_config as config;
```
Replacement in pijul/src/identity/mod.rs at line 46 [19.15627]
B:BD[19.17102] → [19.17102:17121]
B:BD[19.17121] → [18.1970:1997]
```
use crate::config;
use crate::config::Author;
```
[19.17102]
[19.17142]
```
use pijul_config as config;
use pijul_config::Author;
```
Replacement in pijul/src/identity/load.rs at line 3 [19.22387]
B:BD[19.22467] → [19.22467:22486]
```
use crate::config;
```
[19.22467]
[19.22507]
```
use pijul_config as config;
```
Deletion in pijul/src/identity/create.rs at line 8 [19.28175]
B:BD[19.28402] → [6.429:448]
```
use crate::config;
```
Insertion in pijul/src/identity/create.rs at line 12 [19.28175]
[20.101]
[21.327]
```
use pijul_config as config;
```

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

B:BD[22.2745] → [23.13401:13464]

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

[22.2745]

[24.2936]

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

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

B:BD[23.13668] → [12.161:229]

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

[23.13668]

[12.229]

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

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

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

B:BD[28.13] → [29.408:546]

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

[28.13]

[29.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[29.568] → [29.568:653]

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

[29.568]

[29.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[28.599] → [3.0:71]

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

[28.599]

[30.192]

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

Replacement in pijul/src/commands/identity.rs at line 1 [19.40825]

B:BD[19.40825] → [19.40826:40839]

B:BD[19.40839] → [18.16782:16880]

∅:D[18.16880] → [19.40929:40932]

B:BD[19.40929] → [19.40929:40932]

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

[19.40825]

[19.40932]

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[31.400] → [29.2762:2841]

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

[31.400]

[31.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[31.483] → [23.24071:24132]

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

[31.483]

[31.539]

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

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

B:BD[31.569] → [31.569:701]

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

[31.569]

[31.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[31.760] → [31.760:826]

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

[31.760]

[31.826]

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

Deletion in pijul/src/commands/client.rs at line 3 [32.4568]
B:BD[32.4588] → [6.1883:1921]
```
use crate::config::global_config_dir;
```
Insertion in pijul/src/commands/client.rs at line 5 [32.4568]
[6.2018]
[32.4588]
```
use pijul_config::global_config_dir;
```
Insertion in pijul/Cargo.toml at line 109 [7.196374]
[32.8483]
[33.309]
```
async-trait = "0.1"
```
Insertion in pijul/Cargo.toml at line 111 [7.196374]
[33.310]
[5.4819]
```
pijul-config = { path = "../pijul-config" }
```
Insertion in Cargo.lock at line 2180 [34.35]
[34.48080]
[34.48080]
```
 "async-trait",
```
Insertion in Cargo.lock at line 2208 [34.35]
[34.48476]
[4.551]
```
 "pijul-config",
```

Migrate from `pijul::config` to `pijul-config`

Dependencies

In channels

Change contents

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 6 [7.52474]

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

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

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

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

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

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

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

Deletion in pijul/src/identity/create.rs at line 8 [19.28175]

Insertion in pijul/src/identity/create.rs at line 12 [19.28175]

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

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

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

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

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

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

Replacement in pijul/src/commands/identity.rs at line 1 [19.40825]

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

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

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

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

Deletion in pijul/src/commands/client.rs at line 3 [32.4568]

Insertion in pijul/src/commands/client.rs at line 5 [32.4568]

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

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

Insertion in Cargo.lock at line 2180 [34.35]

Insertion in Cargo.lock at line 2208 [34.35]