hardy7cc/pijul - Change YW6NICQV5LF4V2G77F2RG2ICODTQ2CKIEVBFIQEDATL5I5PFVRKQC

Migrate codebase to refactored `pijul_config` crate

Mostly just a literal translation to make everything compile, but will need some cleanup to remove ad-hoc configuration logic.

Created by finchie on July 27, 2025

YW6NICQV5LF4V2G77F2RG2ICODTQ2CKIEVBFIQEDATL5I5PFVRKQC

Dependencies

In channels

main

Change contents

Deletion in pijul-repository/src/lib.rs at line 4 [21.21431]
∅:D[20.20] → [21.21540:21541]
∅:D[22.55] → [21.21540:21541]
B:BD[21.21540] → [21.21540:21541]
B:BD[23.24] → [23.24:52]
```
use pijul_config as config;
```
Deletion in pijul-repository/src/lib.rs at line 13 [21.21431]
∅:D[24.70] → [21.21758:21790]
∅:D[20.96] → [21.21758:21790]
B:BD[21.21758] → [21.21758:21790]
```
    pub config: config::Config,
```

Deletion in pijul-repository/src/lib.rs at line 85 [21.21431]

B:BD[19.1137] → [19.1137:1196]

∅:D[19.1196] → [21.23040:23041]

B:BD[21.23040] → [21.23040:23041]

B:BD[21.23515] → [21.23515:23586]

B:BD[21.23586] → [25.588:664]

∅:D[25.664] → [21.23644:23686]

B:BD[21.23644] → [21.23644:23686]

B:BD[21.23686] → [26.7776:7856]

∅:D[26.7856] → [21.23779:23793]

B:BD[21.23779] → [21.23779:23793]

B:BD[21.23793] → [21.23793:23848]

B:BD[21.23848] → [21.23848:23859]

        let config_path = dot_directory.join(CONFIG_FILE);
        let config = if let Ok(config) = std::fs::read(&config_path) {
            if let Ok(toml) = toml::from_str(&String::from_utf8(config)?) {
                toml
            } else {
                bail!("Could not read configuration file at {:?}", config_path)
            }
        } else {
            config::Config::default()
        };

Deletion in pijul-repository/src/lib.rs at line 95 [21.21431]
∅:D[27.484] → [21.24200:24220]
B:BD[21.24200] → [21.24200:24220]
```
            config,
```
Insertion in pijul-repository/src/lib.rs at line 101 [21.21431]
[28.364]
[22.487]
```
        config: &pijul_config::Config,
```

Replacement in pijul-repository/src/lib.rs at line 118 [21.21431]

B:BD[21.24728] → [22.658:700]

            init_dot_ignore(&cur, kind)?;

[21.24728]

[29.59]

            init_dot_ignore(config, &cur, kind)?;

Deletion in pijul-repository/src/lib.rs at line 133 [21.21431]
∅:D[27.646] → [21.25157:25208]
B:BD[21.25157] → [21.25157:25208]
```
                config: config::Config::default(),
```

Deletion in pijul-repository/src/lib.rs at line 140 [21.21431]

B:BD[21.25358] → [30.0:64]

B:BD[30.64] → [30.64:217]


    pub fn update_config(&self) -> Result<(), anyhow::Error> {
        std::fs::write(
            self.path.join(DOT_DIR).join("config"),
            toml::to_string(&self.config)?,
        )?;
        Ok(())
    }

Replacement in pijul-repository/src/lib.rs at line 158 [21.21431]

B:BD[31.608] → [22.901:989]

fn init_dot_ignore(base_path: &Path, kind: Option<&str>) -> Result<(), anyhow::Error> {

[31.608]

[31.689]

fn init_dot_ignore(
    config: &pijul_config::Config,
    base_path: &Path,
    kind: Option<&str>,
) -> Result<(), anyhow::Error> {

Replacement in pijul-repository/src/lib.rs at line 180 [21.21431]

B:BD[2.445] → [2.445:492]

        ignore_specific(&mut dot_ignore, kind)

[2.445]

[31.1104]

        ignore_specific(config, &mut dot_ignore, kind)

Insertion in pijul-repository/src/lib.rs at line 187 [21.21431]
[28.833]
[28.833]
```
    config: &pijul_config::Config,
```

Replacement in pijul-repository/src/lib.rs at line 193 [21.21431]

B:BD[28.984] → [23.54:118]

∅:D[23.118] → [32.209:493]

B:BD[32.209] → [32.209:493]

        if let Ok((config, _)) = pijul_config::Global::load() {
            let ignore_kinds = config.ignore_kinds.as_ref();
            if let Some(kinds) = ignore_kinds.and_then(|x| x.get(kind)) {
                for entry in kinds.iter() {
                    writeln!(dot_ignore, "{}", entry)?;
                }
                return Ok(());

[28.984]

[32.493]

        if let Some(kinds) = config.ignore_kinds.get(kind) {
            for entry in kinds.iter() {
                writeln!(dot_ignore, "{}", entry)?;

Insertion in pijul-repository/src/lib.rs at line 197 [21.21431]
[32.507]
[32.507]
```
            return Ok(());
```
Insertion in pijul-remote/src/ssh.rs at line 100 [21.25380]
[33.45]
[33.45]
```
        config: &pijul_config::Config,
```

Replacement in pijul-remote/src/ssh.rs at line 124 [21.25380]

∅:D[33.363] → [21.27694:27761]

∅:D[34.727] → [21.27694:27761]

B:BD[21.27694] → [21.27694:27761]

B:BD[21.27761] → [34.728:812]

        let config = Arc::new(thrussh::client::Config::default());
        let mut h = thrussh::client::connect_stream(config, stream, client).await?;

[33.363]

[21.27986]

        let client_config = Arc::new(thrussh::client::Config::default());
        let mut h = thrussh::client::connect_stream(client_config, stream, client).await?;

Replacement in pijul-remote/src/ssh.rs at line 133 [21.25380]

B:BD[35.138] → [36.0:64]

                if self.auth_pk(&mut h, &mut key_path).await? {

[35.138]

[37.63]

                if self.auth_pk(config, &mut h, &mut key_path).await? {

Replacement in pijul-remote/src/ssh.rs at line 145 [21.25380]

∅:D[38.484] → [37.477:531]

B:BD[37.477] → [37.477:531]

                    self.auth_password(&mut h).await?

[38.484]

[37.531]

                    self.auth_password(config, &mut h).await?

Insertion in pijul-remote/src/ssh.rs at line 234 [21.25380]
[37.594]
[37.594]
```
        config: &pijul_config::Config,
```

Replacement in pijul-remote/src/ssh.rs at line 254 [21.25380]

B:BD[37.1251] → [36.136:207]

                    let password = pijul_interaction::Password::new()?

[37.1251]

[36.207]

                    let password = pijul_interaction::Password::new(config)?

Insertion in pijul-remote/src/ssh.rs at line 286 [21.25380]
[39.525]
[39.525]
```
        config: &pijul_config::Config,
```

Replacement in pijul-remote/src/ssh.rs at line 307 [21.25380]

B:BD[40.2923] → [36.473:536]

            let password = pijul_interaction::Password::new()?

[40.2923]

[36.536]

            let password = pijul_interaction::Password::new(config)?

Replacement in pijul-remote/src/lib.rs at line 16 [21.52474]
∅:D[41.52] → [23.246:267]
B:BD[42.483] → [23.246:267]
```
use pijul_config::*;
```
[42.457]
[43.78]
```
use pijul_config::remote::{RemoteConfig, RemoteHttpHeader};
use pijul_config::shell_cmd;
```
Replacement in pijul-remote/src/lib.rs at line 51 [21.52474]
B:BD[44.51] → [44.51:74]
```
    repo: &Repository,
```
[44.51]
[44.74]
```
    config: &pijul_config::Config,
```

Replacement in pijul-remote/src/lib.rs at line 60 [21.52474]

B:BD[44.325] → [44.325:469]

    if let Some(name) = repo.config.remotes.iter().find(|e| e.name() == name) {
        name.to_remote(channel, no_cert_check, with_path).await

[44.325]

[44.469]

    if let Some(name) = config.remotes.iter().find(|e| e.name() == name) {
        name.to_remote(config, channel, no_cert_check, with_path)
            .await

Replacement in pijul-remote/src/lib.rs at line 64 [21.52474]

B:BD[44.482] → [44.482:569]

        unknown_remote(self_path, user, name, channel, no_cert_check, with_path).await

[44.482]

[21.53361]

        unknown_remote(
            config,
            self_path,
            user,
            name,
            channel,
            no_cert_check,
            with_path,
        )
        .await

Insertion in pijul-remote/src/lib.rs at line 80 [21.52474]
[41.209]
[41.209]
```
    config: &pijul_config::Config,
```

Replacement in pijul-remote/src/lib.rs at line 93 [21.52474]

B:BD[41.573] → [41.573:1129]

    let mut remote = if let Ok(repo) = Repository::find_root(None) {
        repository(
            &repo,
            None,
            Some(&identity.config.author.username),
            &remote,
            libpijul::DEFAULT_CHANNEL,
            no_cert_check,
            false,
        )
        .await?
    } else {
        unknown_remote(
            None,
            Some(&identity.config.author.username),
            &remote,
            libpijul::DEFAULT_CHANNEL,
            no_cert_check,
            false,
        )
        .await?
    };

[41.573]

[41.1129]

    let mut remote = repository(
        config,
        None,
        Some(&identity.config.author.username),
        &remote,
        libpijul::DEFAULT_CHANNEL,
        no_cert_check,
        false,
    )
    .await?;

Replacement in pijul-remote/src/lib.rs at line 108 [21.52474]
B:BD[41.1222] → [41.1222:1257]
```
        .decrypt(&identity.name)?;
```
[41.1222]
[41.1257]
```
        .decrypt(config, &identity.name)?;
```
Insertion in pijul-remote/src/lib.rs at line 118 [21.52474]
[23.343]
[23.343]
```
        config: &pijul_config::Config,
```
Insertion in pijul-remote/src/lib.rs at line 128 [21.52474]
[45.264]
[45.264]
```
        config: &pijul_config::Config,
```

Replacement in pijul-remote/src/lib.rs at line 137 [21.52474]

B:BD[45.586] → [45.586:659]

                    if let Some(c) = sshr.connect(ssh, channel).await? {

[45.586]

[45.659]

                    if let Some(c) = sshr.connect(config, ssh, channel).await? {

Insertion in pijul-remote/src/lib.rs at line 174 [21.52474]
[21.53399]
[46.212]
```
    config: &pijul_config::Config,
```

Replacement in pijul-remote/src/lib.rs at line 198 [21.52474]

B:BD[47.663] → [33.466:535]

                if let Some(c) = ssh.connect(name, channel).await? {

[47.663]

[33.535]

                if let Some(c) = ssh.connect(config, name, channel).await? {

Replacement in pijul-remote/src/lib.rs at line 241 [21.52474]

B:BD[46.884] → [33.1422:1483]

        if let Some(c) = ssh.connect(name, channel).await? {

[46.884]

[33.1483]

        if let Some(c) = ssh.connect(config, name, channel).await? {

Replacement in pijul-interaction/src/input/mod.rs at line 7 [48.8063]
B:BD[48.8269] → [48.8269:8291]
```
use dialoguer::theme;
```
[48.8269]
[48.8291]
```
use dialoguer::theme::Theme;
```
Replacement in pijul-interaction/src/input/mod.rs at line 10 [48.8063]
B:BD[48.8392] → [8.1069:1138]
```
use pijul_config::{self as config, Choice};
use std::sync::LazyLock;
```
[48.8392]
[48.8552]
```
use std::sync::OnceLock;
```

Replacement in pijul-interaction/src/input/mod.rs at line 12 [48.8063]

B:BD[48.8553] → [8.1139:1336]

static THEME: LazyLock<Box<dyn theme::Theme + Send + Sync>> = LazyLock::new(|| {
    if let Ok((config, _)) = config::Global::load() {
        let color_choice = config.colors.unwrap_or_default();

[48.8553]

[48.8677]

static THEME: OnceLock<Box<dyn Theme + Send + Sync>> = OnceLock::new();

Deletion in pijul-interaction/src/input/mod.rs at line 14 [48.8063]

B:BD[48.8678] → [8.1337:1510]

∅:D[8.1510] → [48.8945:8955]

B:BD[48.8945] → [48.8945:8955]

B:BD[48.8955] → [8.1511:1581]

∅:D[8.1581] → [48.8964:8965]

B:BD[48.8964] → [48.8964:8965]

        match color_choice {
            Choice::Auto | Choice::Always => Box::<theme::ColorfulTheme>::default(),
            Choice::Never => Box::new(theme::SimpleTheme),
        }
    } else {
        Box::<theme::ColorfulTheme>::default()
    }
});

Replacement in pijul-interaction/src/input/mod.rs at line 60 [48.8063]

B:BD[48.10665] → [48.10665:10718]

    pub fn new() -> Result<Self, InteractionError> {

[48.10665]

[48.10718]

    pub fn new(config: &pijul_config::Config) -> Result<Self, InteractionError> {

Replacement in pijul-interaction/src/input/mod.rs at line 62 [48.8063]

B:BD[48.10764] → [48.10764:10865]

            InteractiveContext::Terminal => Box::new(terminal::handler::with_theme(THEME.as_ref())),

[48.10764]

[48.10865]

            InteractiveContext::Terminal => {
                let theme = THEME.get_or_init(|| config.theme());
                Box::new(terminal::handler::with_theme(theme.as_ref()))
            }

Replacement in pijul-identity/src/repair.rs at line 1 [49.56]
B:BD[49.97] → [50.343:364]
B:BD[50.364] → [23.516:544]
∅:D[23.544] → [49.190:191]
B:BD[49.190] → [49.190:191]
```
use super::Complete;
use pijul_config as config;
```
[49.56]
[49.191]
```
use crate::{Complete, IdentityConfig};
```
Insertion in pijul-identity/src/repair.rs at line 3 [49.56]
[49.234]
[49.234]
```
use pijul_config::author::Author;
use pijul_config::global::Global;
```

Replacement in pijul-identity/src/repair.rs at line 42 [49.56]

B:BD[49.3347] → [51.338:399]

∅:D[51.399] → [49.3509:3565]

B:BD[49.3509] → [49.3509:3565]

pub async fn fix_identities() -> Result<(), anyhow::Error> {
    let mut dir = config::global_config_dir().unwrap();

[49.3347]

[49.3565]

pub async fn fix_identities(config: &pijul_config::Config) -> Result<(), anyhow::Error> {
    let config_path = Global::config_file().unwrap();
    let mut dir = config_path.parent().unwrap().to_path_buf();

Replacement in pijul-identity/src/repair.rs at line 55 [49.56]

B:BD[49.3880] → [50.365:426]

        let extraction_result = Complete::from_old_format();

[49.3880]

[49.3945]

        let extraction_result = Complete::from_old_format(config);

Replacement in pijul-identity/src/repair.rs at line 65 [49.56]

B:BD[49.4220] → [51.400:458]

                old_identity.clone().create(true).await?;

[49.4220]

[49.4888]

                old_identity.clone().create(config, true).await?;

Replacement in pijul-identity/src/repair.rs at line 91 [49.56]

B:BD[49.6256] → [51.459:525]

                        Complete::default()?.create(true).await?;

[49.6256]

[49.6333]

                        Complete::default(config)?.create(config, true).await?;

Replacement in pijul-identity/src/repair.rs at line 103 [49.56]
B:BD[49.6618] → [49.6618:6650]
```
        identity.valid_keys()?;
```
[49.6618]
[49.6650]
```
        identity.valid_keys(config)?;
```

Replacement in pijul-identity/src/repair.rs at line 111 [49.56]

B:BD[49.6735] → [49.6735:6793]

    fn valid_keys(&self) -> Result<bool, anyhow::Error> {

[49.6735]

[50.520]

    fn valid_keys(&self, config: &pijul_config::Config) -> Result<bool, anyhow::Error> {

Replacement in pijul-identity/src/repair.rs at line 113 [49.56]

B:BD[50.563] → [50.563:629]

        let decryped_public_key = self.decrypt()?.0.public_key();

[50.563]

[49.7160]

        let decryped_public_key = self.decrypt(config)?.0.public_key();

Insertion in pijul-identity/src/repair.rs at line 131 [49.56]

[49.8206]

    /// * `config` - User-specified configuration values to change runtime behaviour

Replacement in pijul-identity/src/repair.rs at line 176 [49.56]

B:BD[49.9995] → [50.1053:1116]

∅:D[50.1116] → [49.10086:10208]

B:BD[49.10086] → [49.10086:10208]

    fn from_old_format() -> Result<Self, IdentityParseError> {
        let config_dir = config::global_config_dir().unwrap();
        let config_path = config_dir.join("config.toml");

[49.9995]

[49.10208]

    fn from_old_format(config: &pijul_config::Config) -> Result<Self, IdentityParseError> {
        let config_path = Global::config_file().unwrap();
        let config_dir = config_path.parent().unwrap();
        let config_path = config_dir.join(pijul_config::CONFIG_FILE);

Deletion in pijul-identity/src/repair.rs at line 263 [49.56]

B:BD[49.13840] → [49.13840:13841]

B:BD[49.13841] → [50.1325:1387]

∅:D[50.1387] → [49.13904:14203]

B:BD[49.13904] → [49.13904:14203]


        let config: super::Config = if config_path.exists() {
            let mut config_file =
                fs::File::open(&config_path).context("Failed to open config file")?;
            let mut config_text = String::new();
            config_file
                .read_to_string(&mut config_text)
                .context("Failed to read config file")?;

Replacement in pijul-identity/src/repair.rs at line 264 [49.56]

B:BD[49.14204] → [49.14204:14336]

            let config_data: config::Global =
                toml::from_str(&config_text).context("Failed to parse config file")?;

[49.14204]

[50.1388]

        let identity_config: IdentityConfig = if config_path.exists() {
            let config_path = Global::config_file().unwrap();
            let config_text = Global::read_contents(&config_path)?;
            let config_data = Global::parse_contents(&config_path, &config_text)?;

Replacement in pijul-identity/src/repair.rs at line 269 [49.56]
B:BD[50.1389] → [50.1389:1417]
```
            super::Config {
```
[50.1389]
[50.1417]
```
            IdentityConfig {
```

Replacement in pijul-identity/src/repair.rs at line 274 [49.56]

B:BD[49.14384] → [50.1539:1595]

            let mut author = config::Author::default();

[49.14384]

[52.3345]

            let mut author = Author::default();

Replacement in pijul-identity/src/repair.rs at line 279 [49.56]
B:BD[49.14647] → [50.1719:1747]
```
            super::Config {
```
[49.14647]
[50.1747]
```
            IdentityConfig {
```
Replacement in pijul-identity/src/repair.rs at line 287 [49.56]
B:BD[49.14980] → [50.1818:1838]
```
            config,
```
[49.14980]
[50.1838]
```
            identity_config,
```
Replacement in pijul-identity/src/repair.rs at line 292 [49.56]
B:BD[49.15446] → [49.15446:15482]
```
        if identity.valid_keys()? {
```
[49.15446]
[49.15482]
```
        if identity.valid_keys(config)? {
```
Deletion in pijul-identity/src/load.rs at line 3 [49.22387]
∅:D[38.1564] → [23.600:628]
B:BD[49.22467] → [23.600:628]
```
use pijul_config as config;
```
Insertion in pijul-identity/src/load.rs at line 5 [49.22387]
[49.22551]
[49.22551]
```
use pijul_config::global::Global;
```

Deletion in pijul-identity/src/load.rs at line 26 [49.22387]

B:BD[49.23162] → [49.23162:23297]

    let mut path = config::global_config_dir()
        .expect("Could not find global config directory")
        .join("identities");

Replacement in pijul-identity/src/load.rs at line 30 [49.22387]

B:BD[49.23384] → [49.23384:23405]

    path.push(name);

[49.23384]

[49.23405]

    let config_file_path = Global::config_file().unwrap();
    let config_directory = config_file_path
        .parent()
        .expect("Could not find global config directory");
    let path = config_directory.join("identities").join(name);

Insertion in pijul-identity/src/load.rs at line 67 [49.22387]

[49.24405]

[49.24491]

/// # Arguments
/// * `config` - User-specified configuration values to change runtime behaviour
///

Replacement in pijul-identity/src/load.rs at line 72 [49.22387]

B:BD[49.24577] → [51.526:597]

pub async fn choose_identity_name() -> Result<String, anyhow::Error> {

[49.24577]

[49.24663]

pub async fn choose_identity_name(config: &pijul_config::Config) -> Result<String, anyhow::Error> {

Replacement in pijul-identity/src/load.rs at line 79 [49.22387]
B:BD[49.24848] → [51.598:631]
```
        fix_identities().await?;
```
[49.24848]
[49.24890]
```
        fix_identities(config).await?;
```
Replacement in pijul-identity/src/load.rs at line 86 [49.22387]
B:BD[49.25168] → [36.1005:1040]
```
        let index = Select::new()?
```
[49.25168]
[49.25244]
```
        let index = Select::new(config)?
```

Replacement in pijul-identity/src/load.rs at line 126 [49.22387]

B:BD[49.27540] → [49.27540:27603]

        let config_dir = config::global_config_dir().unwrap();

[49.27540]

[49.27603]

        let config_file = Global::config_file().unwrap();
        let config_dir = config_file.parent().unwrap();

Replacement in pijul-identity/src/lib.rs at line 45 [49.15627]
B:BD[49.17102] → [23.545:599]
```
use pijul_config as config;
use pijul_config::Author;
```
[49.17102]
[49.17181]
```
use pijul_config::author::Author;
```
Replacement in pijul-identity/src/lib.rs at line 48 [49.15627]
B:BD[49.17232] → [49.17232:17273]
```
use std::fs;
use std::io::{Read, Write};
```
[49.17232]
[50.2048]
```
use std::io::Write;
```

Replacement in pijul-identity/src/lib.rs at line 57 [49.15627]

B:BD[49.17300] → [53.0:63]

∅:D[53.63] → [50.2190:2210]

B:BD[50.2190] → [50.2190:2210]

#[derive(Clone, Debug, Serialize, Deserialize, PartialEq, Eq)]
pub struct Config {

[49.17300]

[50.2210]

#[derive(Clone, Debug, Default, Serialize, Deserialize, PartialEq, Eq)]
pub struct IdentityConfig {

Deletion in pijul-identity/src/lib.rs at line 63 [49.15627]

B:BD[50.2354] → [50.2354:2508]

}
impl Default for Config {
    fn default() -> Self {
        Self {
            key_path: None,
            author: Author::default(),
        }
    }

Replacement in pijul-identity/src/lib.rs at line 65 [49.15627]
B:BD[50.2511] → [50.2511:2542]
```
impl From<Author> for Config {
```
[50.2511]
[50.2542]
```
impl From<Author> for IdentityConfig {
```

Replacement in pijul-identity/src/lib.rs at line 103 [49.15627]

B:BD[50.3255] → [50.3255:3348]

    pub fn decrypt(&mut self, name: &str) -> Result<(SKey, Option<String>), anyhow::Error> {

[50.3255]

[50.3348]

    pub fn decrypt(
        &mut self,
        config: &pijul_config::Config,
        name: &str,
    ) -> Result<(SKey, Option<String>), anyhow::Error> {

Replacement in pijul-identity/src/lib.rs at line 134 [49.15627]

B:BD[50.4463] → [36.792:844]

                password_attempt = Password::new()?

[50.4463]

[50.4551]

                password_attempt = Password::new(config)?

Replacement in pijul-identity/src/lib.rs at line 162 [49.15627]
B:BD[50.5137] → [50.5137:5161]
```
    pub config: Config,
```
[50.5137]
[54.165]
```
    pub config: IdentityConfig,
```
Replacement in pijul-identity/src/lib.rs at line 179 [49.15627]
B:BD[49.18075] → [50.5524:5548]
```
        config: Config,
```
[49.18075]
[50.5548]
```
        config: IdentityConfig,
```

Replacement in pijul-identity/src/lib.rs at line 197 [49.15627]

B:BD[49.18433] → [49.18433:18571]

B:BD[49.18571] → [50.5844:5899]

∅:D[50.5899] → [49.18634:18807]

B:BD[49.18634] → [49.18634:18807]

    pub fn default() -> Result<Self, anyhow::Error> {
        let config_path = config::global_config_dir().unwrap().join("config.toml");
        let author: Author = if config_path.exists() {
            let mut config_file = fs::File::open(&config_path)?;
            let mut config_text = String::new();
            config_file.read_to_string(&mut config_text)?;

[49.18433]

[49.18807]

    pub fn default(config: &pijul_config::Config) -> Result<Self, anyhow::Error> {
        // let config_path = config::global_config_dir().unwrap().join("config.toml");
        // let author: Author = if config_path.exists() {
        //     let mut config_file = fs::File::open(&config_path)?;
        //     let mut config_text = String::new();
        //     config_file.read_to_string(&mut config_text)?;

Replacement in pijul-identity/src/lib.rs at line 204 [49.15627]

B:BD[49.18808] → [49.18808:18937]

B:BD[49.18937] → [50.5900:5930]

∅:D[50.5930] → [49.19100:19111]

B:BD[49.19100] → [49.19100:19111]

            let global_config: config::Global = toml::from_str(&config_text)?;
            global_config.author
        } else {
            Author::default()
        };

[49.18808]

[49.19111]

        //     let global_config: config::Global = toml::from_str(&config_text)?;
        //     global_config.author
        // } else {
        //     Author::default()
        // };

Replacement in pijul-identity/src/lib.rs at line 215 [49.15627]

B:BD[49.19269] → [50.5931:5965]

            Config::from(author),

[49.19269]

[50.5965]

            IdentityConfig::from(config.author.to_owned()),

Replacement in pijul-identity/src/lib.rs at line 236 [49.15627]
∅:D[54.291] → [50.6588:6617]
B:BD[50.6588] → [50.6588:6617]
```
            config: Config {
```
[54.291]
[50.6617]
```
            config: IdentityConfig {
```

Replacement in pijul-identity/src/lib.rs at line 247 [49.15627]

B:BD[50.6972] → [50.6972:7111]

    pub fn decrypt(&self) -> Result<(SKey, Option<String>), anyhow::Error> {
        self.credentials.clone().unwrap().decrypt(&self.name)

[50.6972]

[50.7111]

    pub fn decrypt(
        &self,
        config: &pijul_config::Config,
    ) -> Result<(SKey, Option<String>), anyhow::Error> {
        self.credentials
            .clone()
            .unwrap()
            .decrypt(config, &self.name)

Replacement in pijul-identity/src/lib.rs at line 257 [49.15627]

B:BD[50.7118] → [50.7118:7232]

    fn change_password(&mut self) -> Result<(), anyhow::Error> {
        let (decryped_key, _) = self.decrypt()?;

[50.7118]

[50.7232]

    fn change_password(&mut self, config: &pijul_config::Config) -> Result<(), anyhow::Error> {
        let (decryped_key, _) = self.decrypt(config)?;

Replacement in pijul-identity/src/lib.rs at line 260 [49.15627]

B:BD[50.7233] → [36.890:935]

        let user_password = Password::new()?

[50.7233]

[50.7314]

        let user_password = Password::new(config)?

Insertion in pijul-identity/src/create.rs at line 18 [49.28175]

[49.29054]

[55.0]

    /// * `config` - User-specified configuration values to change runtime behaviour

Insertion in pijul-identity/src/create.rs at line 22 [49.28175]
[50.8903]
[36.1176]
```
        config: &pijul_config::Config,
```
Replacement in pijul-identity/src/create.rs at line 29 [49.28175]
B:BD[49.29270] → [36.1263:1305]
```
        new_identity.name = Input::new()?
```
[49.29270]
[49.29341]
```
        new_identity.name = Input::new(config)?
```

Replacement in pijul-identity/src/create.rs at line 63 [49.28175]

B:BD[49.30212] → [36.1605:1669]

        new_identity.config.author.display_name = Input::new()?

[49.30212]

[49.30279]

        new_identity.config.author.display_name = Input::new(config)?

Replacement in pijul-identity/src/create.rs at line 69 [49.28175]

B:BD[49.30597] → [36.1734:1791]

        new_identity.config.author.email = Input::new()?

[49.30597]

[49.30665]

        new_identity.config.author.email = Input::new(config)?

Replacement in pijul-identity/src/create.rs at line 84 [49.28175]
B:BD[50.9436] → [36.1929:1956]
```
        if Confirm::new()?
```
[50.9436]
[50.9484]
```
        if Confirm::new(config)?
```
Replacement in pijul-identity/src/create.rs at line 97 [49.28175]
B:BD[50.10379] → [50.10379:10424]
```
            new_identity.change_password()?;
```
[50.10379]
[50.10424]
```
            new_identity.change_password(config)?;
```
Replacement in pijul-identity/src/create.rs at line 101 [49.28175]
B:BD[50.10497] → [50.10497:10536]
```
        new_identity.prompt_expiry()?;
```
[50.10497]
[56.305]
```
        new_identity.prompt_expiry(config)?;
```
Replacement in pijul-identity/src/create.rs at line 104 [49.28175]
B:BD[41.1393] → [41.1393:1424]
```
            if Confirm::new()?
```
[41.1393]
[41.1424]
```
            if Confirm::new(config)?
```

Replacement in pijul-identity/src/create.rs at line 109 [49.28175]

B:BD[56.855] → [41.1569:1622]

                new_identity.prompt_remote().await?;

[56.855]

[41.1622]

                new_identity.prompt_remote(config).await?;

Replacement in pijul-identity/src/create.rs at line 123 [49.28175]

B:BD[50.10891] → [50.10891:10957]

    async fn prompt_ssh(&mut self) -> Result<(), anyhow::Error> {

[50.10891]

[50.10957]

    async fn prompt_ssh(&mut self, config: &pijul_config::Config) -> Result<(), anyhow::Error> {

Replacement in pijul-identity/src/create.rs at line 128 [49.28175]
B:BD[50.11181] → [36.2082:2121]
```
        let selection = Select::new()?
```
[50.11181]
[50.11261]
```
        let selection = Select::new(config)?
```

Replacement in pijul-identity/src/create.rs at line 160 [49.28175]

B:BD[50.12406] → [56.1520:1589]

B:BD[56.1589] → [36.2187:2239]

    async fn prompt_remote(&mut self) -> Result<(), anyhow::Error> {
        self.config.author.username = Input::new()?

[50.12406]

[50.12619]

    async fn prompt_remote(&mut self, config: &pijul_config::Config) -> Result<(), anyhow::Error> {
        self.config.author.username = Input::new(config)?

Replacement in pijul-identity/src/create.rs at line 167 [49.28175]

B:BD[50.12819] → [36.2314:2364]

        self.config.author.origin = Input::new()?

[50.12819]

[50.12890]

        self.config.author.origin = Input::new(config)?

Replacement in pijul-identity/src/create.rs at line 173 [49.28175]
B:BD[50.13093] → [36.2449:2476]
```
        if Confirm::new()?
```
[50.13093]
[52.4143]
```
        if Confirm::new(config)?
```
Replacement in pijul-identity/src/create.rs at line 185 [49.28175]
B:BD[52.4542] → [52.4542:4580]
```
            self.prompt_ssh().await?;
```
[52.4542]
[50.13377]
```
            self.prompt_ssh(config).await?;
```

Replacement in pijul-identity/src/create.rs at line 193 [49.28175]

B:BD[49.31273] → [50.13410:13473]

    fn prompt_expiry(&mut self) -> Result<(), anyhow::Error> {

[49.31273]

    fn prompt_expiry(&mut self, config: &pijul_config::Config) -> Result<(), anyhow::Error> {

Replacement in pijul-identity/src/create.rs at line 199 [49.28175]

B:BD[49.31446] → [36.2536:2589]

        self.public_key.expires = if Confirm::new()?

[49.31446]

[49.31507]

        self.public_key.expires = if Confirm::new(config)?

Replacement in pijul-identity/src/create.rs at line 210 [49.28175]

B:BD[54.500] → [54.500:552]

            let expiry_date: String = Input::new()?

[54.500]

[49.31885]

            let expiry_date: String = Input::new(config)?

Insertion in pijul-identity/src/create.rs at line 269 [49.28175]

[49.38371]

[49.38441]

    /// * `config` - User-specified configuration values to change runtime behaviour

Replacement in pijul-identity/src/create.rs at line 271 [49.28175]

B:BD[49.38529] → [51.632:713]

    pub async fn create(&self, link_remote: bool) -> Result<(), anyhow::Error> {

[49.38529]

[50.14019]

    pub async fn create(
        &self,
        config: &pijul_config::Config,
        link_remote: bool,
    ) -> Result<(), anyhow::Error> {

Replacement in pijul-identity/src/create.rs at line 277 [49.28175]

B:BD[50.14076] → [51.714:794]

        let confirmed_identity = self.prompt_changes(None, link_remote).await?;

[50.14076]

[53.1007]

        let confirmed_identity = self.prompt_changes(config, None, link_remote).await?;

Insertion in pijul/src/main.rs at line 5 [21.83981]
[42.694]
[51.0]
```
use pijul_config::Config;
```

Insertion in pijul/src/main.rs at line 218 [21.83981]

[21.88414]

    let repository_path = std::env::current_dir()?;
    let config = Config::load(&repository_path)?;
    log::debug!("{config:#?}");

Replacement in pijul/src/main.rs at line 224 [21.83981]

B:BD[21.88438] → [57.84:169]

∅:D[57.169] → [21.88523:88578]

∅:D[58.4705] → [21.88523:88578]

B:BD[21.88523] → [21.88523:88578]

B:BD[21.88578] → [59.497:555]

∅:D[57.222] → [60.231:277]

∅:D[59.555] → [60.231:277]

B:BD[21.88636] → [60.231:277]

B:BD[60.277] → [61.102:154]

∅:D[61.154] → [21.88682:88786]

∅:D[60.277] → [21.88682:88786]

∅:D[58.4758] → [21.88682:88786]

B:BD[21.88682] → [21.88682:88786]

B:BD[21.88786] → [57.223:275]

        SubCommand::Log(l) => l.run(),
        SubCommand::Init(init) => init.run(),
        SubCommand::Clone(clone) => clone.run().await,
        SubCommand::Record(record) => record.run().await,
        SubCommand::Diff(diff) => diff.run(),
        SubCommand::Status(status) => status.run(),
        SubCommand::Push(push) => push.run().await,
        SubCommand::Pull(pull) => pull.run().await,
        SubCommand::Change(change) => change.run(),

[21.88438]

[62.102]

        SubCommand::Log(l) => l.run(&config),
        SubCommand::Init(init) => init.run(&config),
        SubCommand::Clone(clone) => clone.run(&config).await,
        SubCommand::Record(record) => record.run(&config).await,
        SubCommand::Diff(diff) => diff.run(&config),
        SubCommand::Status(status) => status.run(&config),
        SubCommand::Push(push) => push.run(&config).await,
        SubCommand::Pull(pull) => pull.run(&config).await,
        SubCommand::Change(change) => change.run(&config),

Replacement in pijul/src/main.rs at line 242 [21.83981]

B:BD[57.627] → [57.627:676]

        SubCommand::Reset(reset) => reset.run(),

[57.627]

[57.677]

        SubCommand::Reset(reset) => reset.run(&config),

Replacement in pijul/src/main.rs at line 245 [21.83981]

B:BD[57.772] → [57.772:830]

        SubCommand::Unrecord(unrecord) => unrecord.run(),

[57.772]

[57.830]

        SubCommand::Unrecord(unrecord) => unrecord.run(&config),

Replacement in pijul/src/main.rs at line 247 [21.83981]

B:BD[57.879] → [57.879:931]

∅:D[57.931] → [21.89537:89598]

∅:D[58.5531] → [21.89537:89598]

B:BD[21.89537] → [21.89537:89598]

B:BD[21.89598] → [57.932:984]

B:BD[57.984] → [59.556:683]

        SubCommand::Remote(remote) => remote.run(),
        SubCommand::Archive(archive) => archive.run().await,
        SubCommand::Credit(credit) => credit.run(),
        SubCommand::Tag(tag) => tag.run().await,
        SubCommand::Identity(identity_wizard) => identity_wizard.run().await,

[57.879]

[63.3359]

        SubCommand::Remote(remote) => remote.run(&config),
        SubCommand::Archive(archive) => archive.run(&config).await,
        SubCommand::Credit(credit) => credit.run(&config),
        SubCommand::Tag(tag) => tag.run(&config).await,
        SubCommand::Identity(identity_wizard) => identity_wizard.run(&config).await,

Replacement in pijul/src/commands/unrecord.rs at line 32 [21.95630]

B:BD[21.96125] → [57.1028:1080]

    pub fn run(self) -> Result<(), anyhow::Error> {

[21.96125]

[13.169]

    pub fn run(self, config: &pijul_config::Config) -> Result<(), anyhow::Error> {

Deletion in pijul/src/commands/unrecord.rs at line 34 [21.95630]
∅:D[13.239] → [21.96236:96273]
∅:D[64.313] → [21.96236:96273]
∅:D[22.1118] → [21.96236:96273]
∅:D[58.5791] → [21.96236:96273]
∅:D[65.13400] → [21.96236:96273]
B:BD[21.96236] → [21.96236:96273]
```
        debug!("{:?}", repo.config);
```

Replacement in pijul/src/commands/unrecord.rs at line 45 [21.95630]

B:BD[66.60] → [66.60:127]

            } else if let Some(n) = repo.config.unrecord_changes {

[66.60]

[20.2859]

            } else if let Some(n) = config.unrecord_changes {

Replacement in pijul/src/commands/unrecord.rs at line 48 [21.95630]

B:BD[67.2745] → [23.658:720]

∅:D[23.720] → [20.2936:3330]

∅:D[65.13464] → [20.2936:3330]

B:BD[20.2936] → [20.2936:3330]

                let (cfg, _) = pijul_config::Global::load()?;
                cfg.unrecord_changes.ok_or_else(|| {
                    anyhow!(
                        "Can't determine how many changes to show. \
                         Please set the `unrecord_changes` option in \
                         your global config or run `pijul unrecord` \
                         with the `--show-changes` option."
                    )
                })?

[67.2745]

[67.2776]

                return Err(anyhow!(
                    "Can't determine how many changes to show. \
                     Please set the `unrecord_changes` option in \
                     your config or run `pijul unrecord` \
                     with the `--show-changes` option."
                ));

Replacement in pijul/src/commands/tag.rs at line 76 [68.74]

B:BD[68.1480] → [40.0:58]

    pub async fn run(self) -> Result<(), anyhow::Error> {

[68.1480]

[68.1538]

    pub async fn run(self, config: &pijul_config::Config) -> Result<(), anyhow::Error> {

Replacement in pijul/src/commands/tag.rs at line 111 [68.74]

B:BD[68.2976] → [40.59:142]

                let header = header(author.as_deref(), message, timestamp).await?;

[68.2976]

[10.1031]

                let header = header(config, author.as_deref(), message, timestamp).await?;

Replacement in pijul/src/commands/tag.rs at line 214 [68.74]

B:BD[69.620] → [70.0:58]

                super::pager(repo.config.pager.as_ref());

[69.620]

[24.3129]

                super::pager(config);

Insertion in pijul/src/commands/tag.rs at line 235 [68.74]
[40.160]
[68.4624]
```
    config: &pijul_config::Config,
```

Replacement in pijul/src/commands/tag.rs at line 245 [68.74]

B:BD[65.13668] → [23.721:788]

B:BD[23.788] → [43.157:250]

    } else if let Some(_dir) = pijul_config::global_config_dir() {
        let k = pijul_identity::public_key(&pijul_identity::choose_identity_name().await?)?;

[65.13668]

[40.329]

    } else {
        let identity_name = pijul_identity::choose_identity_name(config).await?;
        let k = pijul_identity::public_key(&identity_name)?;

Replacement in pijul/src/commands/status.rs at line 27 [61.189]

B:BD[61.1186] → [61.1186:1238]

    pub fn run(self) -> Result<(), anyhow::Error> {

[61.1186]

[18.123]

    pub fn run(self, config: &pijul_config::Config) -> Result<(), anyhow::Error> {

Replacement in pijul/src/commands/status.rs at line 58 [61.189]
∅:D[71.448] → [61.1584:1603]
B:BD[61.1584] → [61.1584:1603]
```
        diff.run()
```
[71.448]
[61.1603]
```
        diff.run(config)
```

Replacement in pijul/src/commands/reset.rs at line 35 [21.97650]

B:BD[21.98112] → [57.1134:1186]

B:BD[57.1186] → [6.0:68]

∅:D[6.68] → [72.203:353]

B:BD[72.203] → [72.203:353]

    pub fn run(self) -> Result<(), anyhow::Error> {
        let reset_overwrites_changes = pijul_config::Global::load()
            .ok()
            .and_then(|c| c.0.reset_overwrites_changes);
        let overwrite_changes = match reset_overwrites_changes.as_ref() {

[21.98112]

[6.69]

    pub fn run(self, config: &pijul_config::Config) -> Result<(), anyhow::Error> {
        let overwrite_changes = match config.reset_overwrites_changes.as_ref() {

Replacement in pijul/src/commands/record.rs at line 63 [21.101759]

B:BD[21.102774] → [40.478:536]

    pub async fn run(self) -> Result<(), anyhow::Error> {

[21.102774]

[14.153]

    pub async fn run(self, config: &pijul_config::Config) -> Result<(), anyhow::Error> {

Replacement in pijul/src/commands/record.rs at line 68 [21.101759]
B:BD[21.102992] → [73.91:142]
```
        for h in repo.config.hooks.record.iter() {
```
[21.102992]
[5.238]
```
        for h in config.hooks.record.iter() {
```

Replacement in pijul/src/commands/record.rs at line 79 [21.101759]

B:BD[14.407] → [14.407:468]

            for h in repo.config.extra_dependencies.iter() {

[14.407]

[14.468]

            for h in config.extra_dependencies.iter() {

Replacement in pijul/src/commands/record.rs at line 126 [21.101759]
B:BD[21.104017] → [40.537:570]
```
            self.header().await?
```
[21.104017]
[21.104043]
```
            self.header(config).await?
```

Replacement in pijul/src/commands/record.rs at line 140 [21.101759]

B:BD[74.75] → [74.75:168]

            pijul_identity::Complete::load(&pijul_identity::choose_identity_name().await?)?;

[74.75]

[74.168]

            pijul_identity::Complete::load(&pijul_identity::choose_identity_name(config).await?)?;

Replacement in pijul/src/commands/record.rs at line 142 [21.101759]

B:BD[74.169] → [74.169:216]

        let (secret, _) = complete.decrypt()?;

[74.169]

[75.1910]

        let (secret, _) = complete.decrypt(config)?;

Replacement in pijul/src/commands/record.rs at line 204 [21.101759]

B:BD[21.105380] → [40.728:796]

B:BD[40.796] → [23.789:840]

    async fn header(&self) -> Result<ChangeHeader, anyhow::Error> {
        let config = pijul_config::Global::load();

[21.105380]

[75.2059]

    async fn header(&self, config: &pijul_config::Config) -> Result<ChangeHeader, anyhow::Error> {

Replacement in pijul/src/commands/record.rs at line 213 [21.101759]

B:BD[74.387] → [74.387:462]

                .unwrap_or(pijul_identity::choose_identity_name().await?);

[74.387]

[74.462]

                .unwrap_or(pijul_identity::choose_identity_name(config).await?);

Replacement in pijul/src/commands/record.rs at line 220 [21.101759]

B:BD[65.14464] → [65.14464:14592]

        let templates = config
            .as_ref()
            .ok()
            .and_then(|(cfg, _)| cfg.template.as_ref());

[65.14464]

[76.524]

        let templates = config.template.as_ref();

Replacement in pijul/src/commands/pushpull.rs at line 17 [21.111631]
B:BD[42.1759] → [9.445:497]
```
use pijul_config::{RemoteConfig, RemoteHttpHeader};
```
[26.12874]
[38.2571]
```
use pijul_config::remote::{RemoteConfig, RemoteHttpHeader};
```

Replacement in pijul/src/commands/pushpull.rs at line 72 [21.111631]

B:BD[9.1535] → [9.1535:1629]

fn aggregate_remote_info<T>(repo: &Repository, txn: &T) -> Result<RemoteInfos, anyhow::Error>

[9.1535]

[9.1629]

fn aggregate_remote_info<T>(
    config: &pijul_config::Config,
    txn: &T,
) -> Result<RemoteInfos, anyhow::Error>

Replacement in pijul/src/commands/pushpull.rs at line 85 [21.111631]
B:BD[77.473] → [9.1839:1876]
```
    for rc in &repo.config.remotes {
```
[77.473]
[9.1876]
```
    for rc in &config.remotes {
```

Replacement in pijul/src/commands/pushpull.rs at line 149 [21.111631]

B:BD[77.859] → [9.3607:3664]

    if let Some(default) = &repo.config.default_remote {

[77.859]

[9.3664]

    if let Some(default) = &config.default_remote {

Replacement in pijul/src/commands/pushpull.rs at line 185 [21.111631]

B:BD[21.112203] → [57.1423:1475]

    pub fn run(self) -> Result<(), anyhow::Error> {

[21.112203]

[11.149]

    pub fn run(self, config: &pijul_config::Config) -> Result<(), anyhow::Error> {

Replacement in pijul/src/commands/pushpull.rs at line 187 [21.111631]
∅:D[11.215] → [21.112314:112351]
∅:D[22.1710] → [21.112314:112351]
∅:D[58.6541] → [21.112314:112351]
∅:D[78.10395] → [21.112314:112351]
∅:D[65.14652] → [21.112314:112351]
B:BD[21.112314] → [21.112314:112351]
```
        debug!("{:?}", repo.config);
```
[11.215]
[9.4446]
```
        debug!("{:?}", config);
```

Replacement in pijul/src/commands/pushpull.rs at line 192 [21.111631]

B:BD[21.112523] → [9.4486:4558]

                let remote_infos = aggregate_remote_info(&repo, &txn)?;

[21.112523]

[79.49]

                let remote_infos = aggregate_remote_info(config, &txn)?;

Replacement in pijul/src/commands/pushpull.rs at line 269 [21.111631]

B:BD[30.503] → [30.503:638]

                let mut repo = repo;
                repo.config.default_remote = Some(remote);
                repo.update_config()?;

[30.503]

[21.112646]

                if let Some(mut local_config) = config.local() {
                    local_config.default_remote = Some(remote);
                    local_config.write()?;
                }

Deletion in pijul/src/commands/pushpull.rs at line 279 [21.111631]
∅:D[9.7290] → [77.1177:1214]
B:BD[21.112712] → [77.1177:1214]
```
                let mut repo = repo;
```

Replacement in pijul/src/commands/pushpull.rs at line 281 [21.111631]

B:BD[9.7292] → [9.7292:7358]

                let db = aggregate_remote_info(&repo, &mut txn)?;

[9.7292]

[77.1215]

                let db = aggregate_remote_info(config, &mut txn)?;

Replacement in pijul/src/commands/pushpull.rs at line 294 [21.111631]

B:BD[77.1376] → [9.7783:7924]

                fn remove_named_repo(repo: &mut Repository, name: &str) {
                    let idx = repo
                        .config

[77.1376]

[9.7924]

                fn remove_named_remote(local_config: &mut pijul_config::local::Local, name: &str) {
                    let idx = local_config

Replacement in pijul/src/commands/pushpull.rs at line 300 [21.111631]

B:BD[9.8080] → [9.8080:8133]

                    repo.config.remotes.remove(idx);

[9.8080]

[77.1466]

                    local_config.remotes.remove(idx);

Replacement in pijul/src/commands/pushpull.rs at line 307 [21.111631]

B:BD[9.8269] → [9.8269:8312]

                    repo: &mut Repository,

[9.8269]

[9.8312]

                    local_config: &mut pijul_config::local::Local,

Replacement in pijul/src/commands/pushpull.rs at line 328 [21.111631]

B:BD[9.8995] → [9.8995:9050]

                        remove_named_repo(repo, name);

[9.8995]

[9.9050]

                        remove_named_remote(local_config, name);

Replacement in pijul/src/commands/pushpull.rs at line 337 [21.111631]

B:BD[9.9258] → [9.9258:9317]

                        repo.config.default_remote = None;

[9.9258]

[9.9317]

                        local_config.default_remote = None;

Insertion in pijul/src/commands/pushpull.rs at line 343 [21.111631]
[9.9386]
[9.9386]
```
                let mut local_config = config.local().unwrap();
```

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

B:BD[9.9413] → [9.9413:9486]

                    flood_delete(flood, exact, d, &mut repo, &mut txn)?;

[9.9413]

[9.9486]

                    flood_delete(flood, exact, d, &mut local_config, &mut txn)?;

Replacement in pijul/src/commands/pushpull.rs at line 351 [21.111631]

B:BD[9.9745] → [9.9745:9826]

                            flood_delete(flood, exact, d, &mut repo, &mut txn)?;

[9.9745]

[9.9826]

                            flood_delete(flood, exact, d, &mut local_config, &mut txn)?;

Replacement in pijul/src/commands/pushpull.rs at line 353 [21.111631]

B:BD[9.9859] → [9.9859:9942]

                            let idx = repo
                                .config

[9.9859]

[9.9942]

                            let idx = local_config

Replacement in pijul/src/commands/pushpull.rs at line 358 [21.111631]

B:BD[9.10130] → [9.10130:10191]

                            repo.config.remotes.remove(idx);

[9.10130]

[9.10191]

                            local_config.remotes.remove(idx);

Replacement in pijul/src/commands/pushpull.rs at line 361 [21.111631]

B:BD[9.10263] → [9.10263:10330]

                                repo.config.default_remote = None;

[9.10263]

[9.10330]

                                local_config.default_remote = None;

Replacement in pijul/src/commands/pushpull.rs at line 366 [21.111631]

B:BD[9.10518] → [9.10518:10599]

                            flood_delete(flood, exact, d, &mut repo, &mut txn)?;

[9.10518]

[9.10599]

                            flood_delete(flood, exact, d, &mut local_config, &mut txn)?;

Replacement in pijul/src/commands/pushpull.rs at line 392 [21.111631]

B:BD[9.11390] → [9.11390:11467]

                        flood_delete(flood, exact, d, &mut repo, &mut txn)?;

[9.11390]

[9.11467]

                        flood_delete(flood, exact, d, &mut local_config, &mut txn)?;

Replacement in pijul/src/commands/pushpull.rs at line 397 [21.111631]
B:BD[77.1658] → [77.1658:1697]
```
                repo.update_config()?;
```
[77.1658]
[21.112988]
```
                local_config.write()?;
```
Replacement in pijul/src/commands/pushpull.rs at line 504 [21.111631]
∅:D[80.20067] → [21.114453:114511]
B:BD[21.114453] → [21.114453:114511]
```
    pub async fn run(self) -> Result<(), anyhow::Error> {
```
[80.20067]
[81.1937]
```
    pub async fn run(self, config: &pijul_config::Config) -> Result<(), anyhow::Error> {
```
Deletion in pijul/src/commands/pushpull.rs at line 507 [21.111631]
∅:D[82.212] → [21.114570:114607]
∅:D[11.366] → [21.114570:114607]
∅:D[22.1781] → [21.114570:114607]
∅:D[46.4329] → [21.114570:114607]
∅:D[58.6659] → [21.114570:114607]
∅:D[78.10461] → [21.114570:114607]
∅:D[65.15285] → [21.114570:114607]
∅:D[80.20135] → [21.114570:114607]
B:BD[21.114570] → [21.114570:114607]
```
        debug!("{:?}", repo.config);
```

Replacement in pijul/src/commands/pushpull.rs at line 513 [21.111631]

B:BD[21.114765] → [21.114765:114832]

        } else if let Some(ref def) = repo.config.default_remote {

[21.114765]

[21.114832]

        } else if let Some(ref def) = config.default_remote {

Replacement in pijul/src/commands/pushpull.rs at line 533 [21.111631]
B:BD[44.1201] → [44.1201:1220]
```
            &repo,
```
[44.1201]
[44.1220]
```
            config,
```
Replacement in pijul/src/commands/pushpull.rs at line 689 [21.111631]
∅:D[80.21786] → [21.117527:117585]
B:BD[21.117527] → [21.117527:117585]
```
    pub async fn run(self) -> Result<(), anyhow::Error> {
```
[80.21786]
[11.972]
```
    pub async fn run(self, config: &pijul_config::Config) -> Result<(), anyhow::Error> {
```
Deletion in pijul/src/commands/pushpull.rs at line 700 [21.111631]
∅:D[83.2459] → [21.117853:117890]
∅:D[24.9332] → [21.117853:117890]
B:BD[21.117853] → [21.117853:117890]
```
        debug!("{:?}", repo.config);
```

Replacement in pijul/src/commands/pushpull.rs at line 702 [21.111631]

B:BD[21.117967] → [21.117967:118034]

        } else if let Some(ref def) = repo.config.default_remote {

[21.117967]

[21.118034]

        } else if let Some(ref def) = config.default_remote {

Replacement in pijul/src/commands/pushpull.rs at line 712 [21.111631]
B:BD[44.1445] → [44.1445:1464]
```
            &repo,
```
[44.1445]
[44.1464]
```
            config,
```

Replacement in pijul/src/commands/mod.rs at line 141 [21.133619]

B:BD[84.13] → [23.841:977]

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

[84.13]

[70.546]

fn pager(config: &pijul_config::Config) -> bool {
    if let Some(pijul_config::Choice::Never) = config.pager {

Deletion in pijul/src/commands/mod.rs at line 144 [21.133619]
B:BD[70.568] → [23.978:1061]
∅:D[23.1061] → [70.653:713]
B:BD[70.653] → [70.653:713]
∅:D[70.713] → [84.119:125]
B:BD[84.119] → [84.119:125]
B:BD[84.125] → [70.714:736]
```
    } else if let Some(pijul_config::Choice::Never) = pijul_config::Global::load()
        .ok()
        .and_then(|(global, _)| global.pager)
    {
        return false;
```
Replacement in pijul/src/commands/log.rs at line 501 [21.134376]
∅:D[85.3949] → [86.14212:14264]
B:BD[86.14212] → [86.14212:14264]
```
    pub fn run(self) -> Result<(), anyhow::Error> {
```
[85.3949]
[70.2192]
```
    pub fn run(self, config: &pijul_config::Config) -> Result<(), anyhow::Error> {
```
Replacement in pijul/src/commands/log.rs at line 505 [21.134376]
B:BD[70.2247] → [70.2247:2306]
```
        super::pager(log_iter.repo.config.pager.as_ref());
```
[70.2247]
[70.2306]
```
        super::pager(config);
```

Replacement in pijul/src/commands/init.rs at line 24 [21.136543]

B:BD[21.136770] → [57.1772:1824]

B:BD[57.1824] → [22.2023:2111]

    pub fn run(self) -> Result<(), anyhow::Error> {
        let repo = Repository::init(self.path.as_deref(), self.kind.as_deref(), None)?;

[21.136770]

[87.512]

    pub fn run(self, config: &pijul_config::Config) -> Result<(), anyhow::Error> {
        let repo = Repository::init(config, self.path.as_deref(), self.kind.as_deref(), None)?;

Replacement in pijul/src/commands/identity.rs at line 2 [49.40825]
∅:D[41.1946] → [23.1210:1254]
∅:D[54.2059] → [23.1210:1254]
B:BD[23.1210] → [23.1210:1254]
```
use pijul_config::{self as config, Author};
```
[54.2059]
[38.3927]
```
use pijul_config::author::Author;
use pijul_config::global::Global;
```
Insertion in pijul/src/commands/identity.rs at line 193 [49.40825]
[49.47263]
[49.47263]
```
    config: &pijul_config::Config,
```

Replacement in pijul/src/commands/identity.rs at line 205 [49.40825]

B:BD[49.47572] → [36.2817:2865]

            pijul_interaction::Password::new()?

[49.47572]

[52.5338]

            pijul_interaction::Password::new(config)?

Replacement in pijul/src/commands/identity.rs at line 223 [49.40825]
B:BD[50.17001] → [50.17001:17028]
```
        identity::Config {
```
[50.17001]
[50.17028]
```
        identity::IdentityConfig {
```

Replacement in pijul/src/commands/identity.rs at line 239 [49.40825]

B:BD[49.48506] → [49.48506:48564]

    pub async fn run(self) -> Result<(), anyhow::Error> {

[49.48506]

[49.48564]

    pub async fn run(self, config: &pijul_config::Config) -> Result<(), anyhow::Error> {

Replacement in pijul/src/commands/identity.rs at line 245 [49.40825]

B:BD[88.150] → [88.150:192]

                    Complete::default()?,

[88.150]

[88.192]

                    config,
                    Complete::default(config)?,

Replacement in pijul/src/commands/identity.rs at line 256 [49.40825]

B:BD[49.49307] → [51.1080:1138]

                identity.create(!options.no_link).await?;

[49.49307]

[41.1971]

                identity.create(config, !options.no_link).await?;

Replacement in pijul/src/commands/identity.rs at line 258 [49.40825]

B:BD[41.1972] → [41.1972:2063]

                if let Err(_) = remote::prove(&identity, None, self.no_cert_check).await {

[41.1972]

[38.4055]

                if let Err(_) = remote::prove(config, &identity, None, self.no_cert_check).await {

Replacement in pijul/src/commands/identity.rs at line 267 [49.40825]

B:BD[49.49398] → [51.1139:1198]

            SubCommand::Repair => fix_identities().await?,

[49.49398]

[49.49480]

            SubCommand::Repair => fix_identities(config).await?,

Replacement in pijul/src/commands/identity.rs at line 272 [49.40825]

B:BD[49.49589] → [51.1199:1292]

                let identity_name = &identity_name.unwrap_or(choose_identity_name().await?);

[49.49589]

[41.2656]

                let identity_name = &identity_name.unwrap_or(choose_identity_name(config).await?);

Replacement in pijul/src/commands/identity.rs at line 274 [49.40825]

B:BD[41.2726] → [41.2726:2821]

                remote::prove(&loaded_identity, server.as_deref(), self.no_cert_check).await?;

[41.2726]

[49.49763]

                remote::prove(
                    config,
                    &loaded_identity,
                    server.as_deref(),
                    self.no_cert_check,
                )
                .await?;

Replacement in pijul/src/commands/identity.rs at line 395 [49.40825]

B:BD[49.54509] → [51.1293:1343]

                    choose_identity_name().await?

[49.54509]

[49.54576]

                    choose_identity_name(config).await?

Insertion in pijul/src/commands/identity.rs at line 401 [49.40825]
[88.516]
[88.516]
```
                    config,
```

Replacement in pijul/src/commands/identity.rs at line 416 [49.40825]

B:BD[55.1054] → [36.2866:2957]

                        .prompt_changes(Some(old_identity.name.clone()), !options.no_link)

[55.1054]

[55.1138]

                        .prompt_changes(config, Some(old_identity.name.clone()), !options.no_link)

Replacement in pijul/src/commands/identity.rs at line 430 [49.40825]

B:BD[41.3303] → [41.3303:3393]

                            remote::prove(&new_identity, None, self.no_cert_check).await;

[41.3303]

[41.3393]

                            remote::prove(config, &new_identity, None, self.no_cert_check).await;

Replacement in pijul/src/commands/identity.rs at line 456 [49.40825]

B:BD[51.1375] → [51.1375:1469]

∅:D[51.1469] → [49.56019:56074]

B:BD[49.56019] → [49.56019:56074]

                    Complete::load(&identity_name.unwrap_or(choose_identity_name().await?))?;
                let path = config::global_config_dir()

[51.1375]

[49.56074]

                    Complete::load(&identity_name.unwrap_or(choose_identity_name(config).await?))?;
                let path = Global::config_file()
                    .unwrap()
                    .parent()

Replacement in pijul/src/commands/identity.rs at line 468 [49.40825]

B:BD[49.56342] → [36.2958:2998]

                    && !Confirm::new()?

[49.56342]

[49.56418]

                    && !Confirm::new(config)?

Deletion in pijul/src/commands/fork.rs at line 3 [21.167873]
∅:D[89.73] → [42.2351:2367]
∅:D[90.4126] → [42.2351:2367]
B:BD[21.167976] → [42.2351:2367]
```
use log::debug;
```
Deletion in pijul/src/commands/fork.rs at line 28 [21.167873]
∅:D[15.207] → [21.168420:168457]
∅:D[22.2182] → [21.168420:168457]
∅:D[78.13203] → [21.168420:168457]
∅:D[58.14697] → [21.168420:168457]
∅:D[65.23738] → [21.168420:168457]
B:BD[21.168420] → [21.168420:168457]
```
        debug!("{:?}", repo.config);
```

Replacement in pijul/src/commands/diff.rs at line 42 [21.173551]

B:BD[21.174051] → [57.2143:2199]

    pub fn run(mut self) -> Result<(), anyhow::Error> {

[21.174051]

[12.207]

    pub fn run(mut self, config: &pijul_config::Config) -> Result<(), anyhow::Error> {

Replacement in pijul/src/commands/diff.rs at line 141 [21.173551]
B:BD[21.175777] → [70.2700:2761]
```
        let colors = is_colored(repo.config.pager.as_ref());
```
[21.175777]
[21.175777]
```
        let colors = is_colored(config);
```

Replacement in pijul/src/commands/diff.rs at line 346 [21.173551]

B:BD[91.400] → [23.1255:1333]

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

[91.400]

[7.35]

pub fn is_colored(config: &pijul_config::Config) -> bool {

Replacement in pijul/src/commands/diff.rs at line 348 [21.173551]

∅:D[7.89] → [23.1334:1394]

B:BD[91.483] → [23.1334:1394]

∅:D[23.1394] → [91.539:569]

∅:D[65.24132] → [91.539:569]

B:BD[91.539] → [91.539:569]

B:BD[91.569] → [23.1395:1525]

∅:D[23.1525] → [91.701:760]

B:BD[91.701] → [91.701:760]

B:BD[91.760] → [23.1526:1591]

∅:D[23.1591] → [91.826:845]

B:BD[91.826] → [91.826:845]

B:BD[91.845] → [70.2842:2891]

∅:D[70.2891] → [91.877:891]

B:BD[91.877] → [91.877:891]

    if let Ok((global, _)) = pijul_config::Global::load() {
        match global.colors {
            Some(pijul_config::Choice::Always) => colors = true,
            Some(pijul_config::Choice::Never) => colors = false,
            _ => {}
        }
        match global.pager {
            Some(pijul_config::Choice::Never) => colors = false,
            _ => {
                super::pager(repo_config_pager);
            }

[7.89]

[92.2086]

    match config.colors {
        Some(pijul_config::Choice::Always) => colors = true,
        Some(pijul_config::Choice::Never) => colors = false,
        _ => {}
    }
    match config.pager {
        Some(pijul_config::Choice::Never) => colors = false,
        _ => {
            super::pager(config);

Deletion in pijul/src/commands/diff.rs at line 358 [21.173551]
B:BD[92.2096] → [91.892:905]
B:BD[91.905] → [70.2892:2943]
```
    } else {
        colors &= super::pager(repo_config_pager);
```

Replacement in pijul/src/commands/credit.rs at line 25 [21.178684]

B:BD[21.179133] → [57.2253:2305]

    pub fn run(self) -> Result<(), anyhow::Error> {

[21.179133]

[16.134]

    pub fn run(self, config: &pijul_config::Config) -> Result<(), anyhow::Error> {

Replacement in pijul/src/commands/credit.rs at line 45 [21.178684]
B:BD[93.309] → [93.309:359]
```
        super::pager(repo.config.pager.as_ref());
```
[93.309]
[93.359]
```
        super::pager(config);
```

Replacement in pijul/src/commands/clone.rs at line 37 [21.182891]

B:BD[21.183813] → [21.183813:183871]

    pub async fn run(self) -> Result<(), anyhow::Error> {

[21.183813]

[94.578]

    pub async fn run(self, config: &pijul_config::Config) -> Result<(), anyhow::Error> {

Insertion in pijul/src/commands/clone.rs at line 39 [21.182891]
[94.633]
[65.24363]
```
            config,
```

Replacement in pijul/src/commands/clone.rs at line 86 [21.182891]

B:BD[95.321] → [22.2538:2625]

        let mut repo = Repository::init(Some(&path), None, Some(&remote_normalised))?;

[95.321]

[24.16742]

        let mut repo = Repository::init(config, Some(&path), None, Some(&remote_normalised))?;

Replacement in pijul/src/commands/client.rs at line 5 [63.4568]
B:BD[96.1966] → [74.548:548]
∅:D[74.548] → [23.1592:1629]
B:BD[97.2018] → [23.1592:1629]
```
use pijul_config::global_config_dir;
```
[96.1966]
[63.4588]
```
use pijul_config::global::Global;
```

Replacement in pijul/src/commands/client.rs at line 23 [63.4568]

B:BD[63.5116] → [63.5116:5172]

        if let Some(mut cached) = global_config_dir() {

[63.5116]

[63.5172]

        if let Some(mut cached) = Global::config_file() {
            cached.pop();

Replacement in pijul/src/commands/change.rs at line 20 [21.189306]

B:BD[21.189681] → [57.2443:2495]

    pub fn run(self) -> Result<(), anyhow::Error> {

[21.189681]

[17.141]

    pub fn run(self, config: &pijul_config::Config) -> Result<(), anyhow::Error> {

Replacement in pijul/src/commands/change.rs at line 44 [21.189306]
∅:D[4.49] → [70.2995:3069]
B:BD[21.190342] → [70.2995:3069]
```
        let colors = super::diff::is_colored(repo.config.pager.as_ref());
```
[4.49]
[92.2150]
```
        let colors = super::diff::is_colored(config);
```

Replacement in pijul/src/commands/archive.rs at line 40 [21.191083]

B:BD[21.191803] → [46.8232:8294]

    pub async fn run(mut self) -> Result<(), anyhow::Error> {

[21.191803]

[21.191861]

    pub async fn run(mut self, config: &pijul_config::Config) -> Result<(), anyhow::Error> {

Insertion in pijul/src/commands/archive.rs at line 76 [21.191083]
[94.781]
[46.8295]
```
                config,
```

Migrate codebase to refactored `pijul_config` crate

Dependencies

In channels

Change contents

Deletion in pijul-repository/src/lib.rs at line 4 [21.21431]

Deletion in pijul-repository/src/lib.rs at line 13 [21.21431]

Deletion in pijul-repository/src/lib.rs at line 85 [21.21431]

Deletion in pijul-repository/src/lib.rs at line 95 [21.21431]

Insertion in pijul-repository/src/lib.rs at line 101 [21.21431]

Replacement in pijul-repository/src/lib.rs at line 118 [21.21431]

Deletion in pijul-repository/src/lib.rs at line 133 [21.21431]

Deletion in pijul-repository/src/lib.rs at line 140 [21.21431]

Replacement in pijul-repository/src/lib.rs at line 158 [21.21431]

Replacement in pijul-repository/src/lib.rs at line 180 [21.21431]

Insertion in pijul-repository/src/lib.rs at line 187 [21.21431]

Replacement in pijul-repository/src/lib.rs at line 193 [21.21431]

Insertion in pijul-repository/src/lib.rs at line 197 [21.21431]

Insertion in pijul-remote/src/ssh.rs at line 100 [21.25380]

Replacement in pijul-remote/src/ssh.rs at line 124 [21.25380]

Replacement in pijul-remote/src/ssh.rs at line 133 [21.25380]

Replacement in pijul-remote/src/ssh.rs at line 145 [21.25380]

Insertion in pijul-remote/src/ssh.rs at line 234 [21.25380]

Replacement in pijul-remote/src/ssh.rs at line 254 [21.25380]

Insertion in pijul-remote/src/ssh.rs at line 286 [21.25380]

Replacement in pijul-remote/src/ssh.rs at line 307 [21.25380]

Replacement in pijul-remote/src/lib.rs at line 16 [21.52474]

Replacement in pijul-remote/src/lib.rs at line 51 [21.52474]

Replacement in pijul-remote/src/lib.rs at line 60 [21.52474]

Replacement in pijul-remote/src/lib.rs at line 64 [21.52474]

Insertion in pijul-remote/src/lib.rs at line 80 [21.52474]

Replacement in pijul-remote/src/lib.rs at line 93 [21.52474]

Replacement in pijul-remote/src/lib.rs at line 108 [21.52474]

Insertion in pijul-remote/src/lib.rs at line 118 [21.52474]

Insertion in pijul-remote/src/lib.rs at line 128 [21.52474]

Replacement in pijul-remote/src/lib.rs at line 137 [21.52474]

Insertion in pijul-remote/src/lib.rs at line 174 [21.52474]

Replacement in pijul-remote/src/lib.rs at line 198 [21.52474]

Replacement in pijul-remote/src/lib.rs at line 241 [21.52474]

Replacement in pijul-interaction/src/input/mod.rs at line 7 [48.8063]

Replacement in pijul-interaction/src/input/mod.rs at line 10 [48.8063]

Replacement in pijul-interaction/src/input/mod.rs at line 12 [48.8063]

Deletion in pijul-interaction/src/input/mod.rs at line 14 [48.8063]

Replacement in pijul-interaction/src/input/mod.rs at line 60 [48.8063]

Replacement in pijul-interaction/src/input/mod.rs at line 62 [48.8063]

Replacement in pijul-identity/src/repair.rs at line 1 [49.56]

Insertion in pijul-identity/src/repair.rs at line 3 [49.56]

Replacement in pijul-identity/src/repair.rs at line 42 [49.56]

Replacement in pijul-identity/src/repair.rs at line 55 [49.56]

Replacement in pijul-identity/src/repair.rs at line 65 [49.56]

Replacement in pijul-identity/src/repair.rs at line 91 [49.56]

Replacement in pijul-identity/src/repair.rs at line 103 [49.56]

Replacement in pijul-identity/src/repair.rs at line 111 [49.56]

Replacement in pijul-identity/src/repair.rs at line 113 [49.56]

Insertion in pijul-identity/src/repair.rs at line 131 [49.56]

Replacement in pijul-identity/src/repair.rs at line 176 [49.56]

Deletion in pijul-identity/src/repair.rs at line 263 [49.56]

Replacement in pijul-identity/src/repair.rs at line 264 [49.56]

Replacement in pijul-identity/src/repair.rs at line 269 [49.56]

Replacement in pijul-identity/src/repair.rs at line 274 [49.56]

Replacement in pijul-identity/src/repair.rs at line 279 [49.56]

Replacement in pijul-identity/src/repair.rs at line 287 [49.56]

Replacement in pijul-identity/src/repair.rs at line 292 [49.56]

Deletion in pijul-identity/src/load.rs at line 3 [49.22387]

Insertion in pijul-identity/src/load.rs at line 5 [49.22387]

Deletion in pijul-identity/src/load.rs at line 26 [49.22387]

Replacement in pijul-identity/src/load.rs at line 30 [49.22387]

Insertion in pijul-identity/src/load.rs at line 67 [49.22387]

Replacement in pijul-identity/src/load.rs at line 72 [49.22387]

Replacement in pijul-identity/src/load.rs at line 79 [49.22387]

Replacement in pijul-identity/src/load.rs at line 86 [49.22387]

Replacement in pijul-identity/src/load.rs at line 126 [49.22387]

Replacement in pijul-identity/src/lib.rs at line 45 [49.15627]

Replacement in pijul-identity/src/lib.rs at line 48 [49.15627]

Replacement in pijul-identity/src/lib.rs at line 57 [49.15627]

Deletion in pijul-identity/src/lib.rs at line 63 [49.15627]

Replacement in pijul-identity/src/lib.rs at line 65 [49.15627]

Replacement in pijul-identity/src/lib.rs at line 103 [49.15627]

Replacement in pijul-identity/src/lib.rs at line 134 [49.15627]

Replacement in pijul-identity/src/lib.rs at line 162 [49.15627]

Replacement in pijul-identity/src/lib.rs at line 179 [49.15627]