hardy7cc/pijul - Change FIMDS32ZN6OCZUBWYNKDHZJ6FNKUC7NRUC37Q45HXQRBSTDM4YSQC

Use subcommand-specific repository config paths

Introduces the repository_path() function on most subcommands, which allows them to propograte the repository path set with --repository <PATH>. Eventually this should be integrated into a trait that all subcommands implement.

Created by finchie on August 1, 2025

FIMDS32ZN6OCZUBWYNKDHZJ6FNKUC7NRUC37Q45HXQRBSTDM4YSQC

Dependencies

In channels

main

Change contents

Replacement in pijul-config/src/lib.rs at line 21 [2.89866]
B:BD[35.4643] → [38.448:463]
```
use log::warn;
```
[35.4643]
[3.976]
```
use log::{info, warn};
```
Replacement in pijul-config/src/lib.rs at line 70 [2.89866]
B:BD[39.17] → [39.17:49]
```
        repository_path: &Path,
```
[39.17]
[39.49]
```
        repository_path: Option<&Path>,
```
Deletion in pijul-config/src/lib.rs at line 73 [2.89866]
∅:D[39.137] → [35.5671:5741]
B:BD[35.5671] → [35.5671:5741]
B:BD[35.5903] → [35.5903:5904]
```
        let local_config_path = Local::config_file(&repository_path);
```

Replacement in pijul-config/src/lib.rs at line 114 [2.89866]

∅:D[38.695] → [37.700:1083]

B:BD[37.700] → [37.700:1083]

        let local_config = match Local::read_contents(&local_config_path) {
            Ok(contents) => {
                // Parse the config (and make sure it's valid!)
                let local_config = Local::parse_contents(&local_config_path, &contents)?;
                // Add the configuration layer as a string
                layers = layers.merge(Toml::string(&contents));

[38.695]

[37.1083]

        let local_config = match repository_path {
            Some(repository_path) => match Local::read_contents(&repository_path) {
                Ok(contents) => {
                    // Parse the config (and make sure it's valid!)
                    let local_config = Local::parse_contents(&repository_path, &contents)?;
                    // Add the configuration layer as a string
                    layers = layers.merge(Toml::string(&contents));

Replacement in pijul-config/src/lib.rs at line 122 [2.89866]

B:BD[37.1084] → [37.1084:1232]

                Some(local_config)
            }
            Err(error) => {
                warn!("Unable to read local config file: {error:#?}");

[37.1084]

[37.1232]

                    Some(local_config)
                }
                Err(error) => {
                    warn!("Unable to read global config file: {error:#?}");
                    None
                }
            },
            None => {
                info!(
                    "Skipping local configuration path - repository path was not supplied by caller"
                );

Replacement in pijul/src/main.rs at line 221 [2.83981]

B:BD[2.88414] → [36.8020:8072]

B:BD[36.8072] → [39.850:913]

    let repository_path = std::env::current_dir()?;
    let config = Config::load(&repository_path, opts.config)?;

[2.88414]

[36.8122]

    let repository_path = match &opts.subcmd {
        SubCommand::Log(log) => log.repository_path(),
        SubCommand::Init(init) => init.repository_path(),
        SubCommand::Clone(clone) => clone.repository_path(),
        SubCommand::Record(record) => record.repository_path(),
        SubCommand::Diff(diff) => diff.repository_path(),
        SubCommand::Status(status) => status.repository_path(),
        SubCommand::Push(push) => push.repository_path(),
        SubCommand::Pull(pull) => pull.repository_path(),
        SubCommand::Change(change) => change.repository_path(),
        SubCommand::Dependents(deps) => deps.repository_path(),
        SubCommand::Channel(channel) => channel.repository_path(),
        SubCommand::Protocol(protocol) => protocol.repository_path(),
        #[cfg(feature = "git")]
        SubCommand::Git(git) => git.repository_path(),
        SubCommand::Move(move_cmd) => move_cmd.repository_path(),
        SubCommand::List(list) => list.repository_path(),
        SubCommand::Add(add) => add.repository_path(),
        SubCommand::Remove(remove) => remove.repository_path(),
        SubCommand::Reset(reset) => reset.repository_path(),
        SubCommand::Debug(debug) => debug.repository_path(),
        SubCommand::Fork(fork) => fork.repository_path(),
        SubCommand::Unrecord(unrecord) => unrecord.repository_path(),
        SubCommand::Apply(apply) => apply.repository_path(),
        SubCommand::Remote(remote) => remote.repository_path(),
        SubCommand::Archive(archive) => archive.repository_path(),
        SubCommand::Credit(credit) => credit.repository_path(),
        SubCommand::Tag(tag) => tag.repository_path(),
        SubCommand::Identity(identity) => identity.repository_path(),
        SubCommand::Client(client) => client.repository_path(),
        SubCommand::ExternalSubcommand(_) | SubCommand::Completion(_) => None,
    };
    let config = Config::load(repository_path, opts.config)?;

Insertion in pijul/src/commands/unrecord.rs at line 11 [2.95630]
[25.956]
[2.95785]
```
use std::path::Path;
```

Insertion in pijul/src/commands/unrecord.rs at line 33 [2.95630]

[2.96125]

[36.9124]

    pub fn repository_path(&self) -> Option<&Path> {
        self.base.repo_path()
    }

Insertion in pijul/src/commands/tag.rs at line 2 [12.74]
[12.95]
[12.149]
```
use std::path::Path;
```

Insertion in pijul/src/commands/tag.rs at line 77 [12.74]

[12.1480]

[36.9575]

    pub fn repository_path(&self) -> Option<&Path> {
        self.base.repo_path()
    }

Replacement in pijul/src/commands/status.rs at line 5 [29.189]
∅:D[30.74] → [29.221:245]
B:BD[29.221] → [29.221:245]
```
use std::path::PathBuf;
```
[30.74]
[29.245]
```
use std::path::{Path, PathBuf};
```

Insertion in pijul/src/commands/status.rs at line 27 [29.189]

[29.1186]

[36.9988]

    pub fn repository_path(&self) -> Option<&Path> {
        self.base.repo_path()
    }

Replacement in pijul/src/commands/reset.rs at line 2 [2.97650]
∅:D[7.42] → [3.1289:1313]
∅:D[19.43] → [3.1289:1313]
∅:D[9.223] → [3.1289:1313]
∅:D[6.588] → [3.1289:1313]
B:BD[2.97650] → [3.1289:1313]
```
use std::path::PathBuf;
```
[19.43]
[3.1313]
```
use std::path::{Path, PathBuf};
```

Insertion in pijul/src/commands/reset.rs at line 35 [2.97650]

[2.98112]

[36.10098]

    pub fn repository_path(&self) -> Option<&Path> {
        self.base.repo_path()
    }

Replacement in pijul/src/commands/record.rs at line 2 [2.101759]
B:BD[3.1453] → [5.0:24]
```
use std::path::PathBuf;
```
[3.1453]
[13.4998]
```
use std::path::{Path, PathBuf};
```

Insertion in pijul/src/commands/record.rs at line 63 [2.101759]

[2.102774]

[36.10263]

    pub fn repository_path(&self) -> Option<&Path> {
        self.base.repo_path()
    }

Insertion in pijul/src/commands/pushpull.rs at line 4 [2.111631]
[31.444]
[28.1582]
```
use std::path::Path;
```

Insertion in pijul/src/commands/pushpull.rs at line 186 [2.111631]

[2.112203]

[36.11149]

    pub fn repository_path(&self) -> Option<&Path> {
        self.base.repo_path()
    }

Insertion in pijul/src/commands/pushpull.rs at line 509 [2.111631]

[16.20067]

[36.12630]

    pub fn repository_path(&self) -> Option<&Path> {
        self.base.repo_path()
    }

Insertion in pijul/src/commands/pushpull.rs at line 696 [2.111631]

[16.21779]

    }
    pub fn repository_path(&self) -> Option<&Path> {
        self.base.repo_path()

Replacement in pijul/src/commands/protocol.rs at line 4 [2.123281]
B:BD[3.1889] → [3.1889:1913]
```
use std::path::PathBuf;
```
[3.1889]
[28.1704]
```
use std::path::{Path, PathBuf};
```

Insertion in pijul/src/commands/protocol.rs at line 51 [2.123281]

[2.124762]

[14.1476]

    pub fn repository_path(&self) -> Option<&Path> {
        self.base.repo_path()
    }

Replacement in pijul/src/commands/log.rs at line 60 [2.134376]

B:BD[18.245] → [32.187:252]

        let repo = Repository::find_root(cmd.base.repo_path())?;

[18.245]

[18.354]

        let repo = Repository::find_root(cmd.repository_path())?;

Insertion in pijul/src/commands/log.rs at line 498 [2.134376]

[17.14053]

[18.3783]

    pub fn repository_path(&self) -> Option<&Path> {
        self.base.repo_path()
    }

Replacement in pijul/src/commands/init.rs at line 1 [2.136543]
B:BD[2.136543] → [3.2160:2184]
```
use std::path::PathBuf;
```
[2.136543]
[3.2184]
```
use std::path::{Path, PathBuf};
```

Insertion in pijul/src/commands/init.rs at line 24 [2.136543]

[2.136770]

[36.13206]

    pub fn repository_path(&self) -> Option<&Path> {
        None
    }

Insertion in pijul/src/commands/identity.rs at line 1 [20.40825]
[20.40825]
[26.2035]
```
use crate::commands::common_opts::RepoPath;
```
Insertion in pijul/src/commands/identity.rs at line 8 [20.40825]
[21.16901]
[20.40973]
```
use std::path::Path;
```
Replacement in pijul/src/commands/identity.rs at line 184 [20.40825]
B:BD[20.47007] → [20.47007:47039]
```
#[derive(Clone, Parser, Debug)]
```
[20.47007]
[20.47039]
```
#[derive(Parser, Debug)]
```
Insertion in pijul/src/commands/identity.rs at line 188 [20.40825]
[20.47116]
[20.47116]
```
    #[clap(flatten)]
    repository_path: RepoPath,
```

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

[20.48506]

[36.13582]

    pub fn repository_path(&self) -> Option<&Path> {
        self.repository_path.repo_path()
    }

Insertion in pijul/src/commands/git.rs at line 45 [2.137210]

[2.138045]

[15.0]

    pub fn repository_path(&self) -> Option<&Path> {
        self.pijul_path.as_deref()
    }

Insertion in pijul/src/commands/fork.rs at line 1 [2.167873]
[2.167873]
[33.0]
```
use std::path::Path;
```

Insertion in pijul/src/commands/fork.rs at line 28 [2.167873]

[2.168309]

[14.1874]

    pub fn repository_path(&self) -> Option<&Path> {
        self.base.repo_path()
    }

Insertion in pijul/src/commands/file_operations.rs at line 28 [2.169058]

[10.109]

[14.1927]

    pub fn repository_path(&self) -> Option<&Path> {
        self.base.repo_path()
    }

Insertion in pijul/src/commands/file_operations.rs at line 102 [2.169058]

[11.101]

[14.1984]

    pub fn repository_path(&self) -> Option<&Path> {
        self.base.repo_path()
    }

Insertion in pijul/src/commands/file_operations.rs at line 141 [2.169058]

[2.171335]

[14.2037]

    pub fn repository_path(&self) -> Option<&Path> {
        self.base.repo_path()
    }

Insertion in pijul/src/commands/file_operations.rs at line 228 [2.169058]

[2.172614]

[14.2090]

    pub fn repository_path(&self) -> Option<&Path> {
        self.base.repo_path()
    }

Replacement in pijul/src/commands/diff.rs at line 3 [2.173551]
∅:D[27.34] → [2.173714:173738]
B:BD[2.173714] → [2.173714:173738]
```
use std::path::PathBuf;
```
[27.34]
[3.2553]
```
use std::path::{Path, PathBuf};
```

Insertion in pijul/src/commands/diff.rs at line 42 [2.173551]

[2.174051]

[36.14844]

    pub fn repository_path(&self) -> Option<&Path> {
        self.base.repo_path()
    }

Insertion in pijul/src/commands/dependents.rs at line 4 [22.243]
[24.1705]
[22.323]
```
use std::path::Path;
```

Insertion in pijul/src/commands/dependents.rs at line 20 [22.243]

[22.707]

    pub fn repository_path(&self) -> Option<&Path> {
        self.base.repo_path()
    }

Insertion in pijul/src/commands/debug.rs at line 7 [2.177758]
[25.1966]
[2.177836]
```
use std::path::Path;
```

Insertion in pijul/src/commands/debug.rs at line 19 [2.177758]

[2.178019]

[14.2200]

    pub fn repository_path(&self) -> Option<&Path> {
        self.base.repo_path()
    }

Replacement in pijul/src/commands/credit.rs at line 2 [2.178684]
B:BD[3.2786] → [3.2786:2810]
```
use std::path::PathBuf;
```
[3.2786]
[3.2810]
```
use std::path::{Path, PathBuf};
```

Insertion in pijul/src/commands/credit.rs at line 25 [2.178684]

[2.179133]

[36.15340]

    pub fn repository_path(&self) -> Option<&Path> {
        self.base.repo_path()
    }

Replacement in pijul/src/commands/clone.rs at line 1 [2.182891]
∅:D[6.1892] → [3.2900:2924]
∅:D[4.2317] → [3.2900:2924]
B:BD[2.182891] → [3.2900:2924]
```
use std::path::PathBuf;
```
[2.182891]
[3.2924]
```
use std::path::{Path, PathBuf};
```

Insertion in pijul/src/commands/clone.rs at line 37 [2.182891]

[2.183813]

[36.15455]

    pub fn repository_path(&self) -> Option<&Path> {
        None
    }

Insertion in pijul/src/commands/client.rs at line 7 [23.4568]
[23.4644]
[23.4773]
```
use std::path::Path;
```

Insertion in pijul/src/commands/client.rs at line 19 [23.4568]

[23.4974]

    pub fn repository_path(&self) -> Option<&Path> {
        None
    }

Insertion in pijul/src/commands/channel.rs at line 2 [2.186892]
[2.186989]
[2.187013]
```
use std::path::Path;
```

Insertion in pijul/src/commands/channel.rs at line 56 [2.186892]

[2.187383]

[14.2361]

    pub fn repository_path(&self) -> Option<&Path> {
        self.base.repo_path()
    }

Insertion in pijul/src/commands/change.rs at line 1 [2.189306]
[2.189306]
[34.0]
```
use std::path::Path;
```

Insertion in pijul/src/commands/change.rs at line 22 [2.189306]

[2.189681]

[36.15782]

    pub fn repository_path(&self) -> Option<&Path> {
        self.base.repo_path()
    }

Insertion in pijul/src/commands/archive.rs at line 5 [2.191083]
[3.3268]
[2.191246]
```
use std::path::Path;
```

Insertion in pijul/src/commands/archive.rs at line 41 [2.191083]

[2.191803]

[36.15921]

    pub fn repository_path(&self) -> Option<&Path> {
        self.base.repo_path()
    }

Replacement in pijul/src/commands/apply.rs at line 1 [2.194289]
∅:D[8.552] → [3.3337:3361]
B:BD[3.3337] → [3.3337:3361]
```
use std::path::PathBuf;
```
[2.194289]
[3.3361]
```
use std::path::{Path, PathBuf};
```

Insertion in pijul/src/commands/apply.rs at line 27 [2.194289]

[2.194761]

[14.2496]

    pub fn repository_path(&self) -> Option<&Path> {
        self.base.repo_path()
    }

Use subcommand-specific repository config paths

Dependencies

In channels

Change contents

Replacement in pijul-config/src/lib.rs at line 21 [2.89866]

Replacement in pijul-config/src/lib.rs at line 70 [2.89866]

Deletion in pijul-config/src/lib.rs at line 73 [2.89866]

Replacement in pijul-config/src/lib.rs at line 114 [2.89866]

Replacement in pijul-config/src/lib.rs at line 122 [2.89866]

Replacement in pijul/src/main.rs at line 221 [2.83981]

Insertion in pijul/src/commands/unrecord.rs at line 11 [2.95630]

Insertion in pijul/src/commands/unrecord.rs at line 33 [2.95630]

Insertion in pijul/src/commands/tag.rs at line 2 [12.74]

Insertion in pijul/src/commands/tag.rs at line 77 [12.74]

Replacement in pijul/src/commands/status.rs at line 5 [29.189]

Insertion in pijul/src/commands/status.rs at line 27 [29.189]

Replacement in pijul/src/commands/reset.rs at line 2 [2.97650]

Insertion in pijul/src/commands/reset.rs at line 35 [2.97650]

Replacement in pijul/src/commands/record.rs at line 2 [2.101759]

Insertion in pijul/src/commands/record.rs at line 63 [2.101759]

Insertion in pijul/src/commands/pushpull.rs at line 4 [2.111631]

Insertion in pijul/src/commands/pushpull.rs at line 186 [2.111631]

Insertion in pijul/src/commands/pushpull.rs at line 509 [2.111631]

Insertion in pijul/src/commands/pushpull.rs at line 696 [2.111631]

Replacement in pijul/src/commands/protocol.rs at line 4 [2.123281]

Insertion in pijul/src/commands/protocol.rs at line 51 [2.123281]

Replacement in pijul/src/commands/log.rs at line 60 [2.134376]

Insertion in pijul/src/commands/log.rs at line 498 [2.134376]

Replacement in pijul/src/commands/init.rs at line 1 [2.136543]

Insertion in pijul/src/commands/init.rs at line 24 [2.136543]

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

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

Replacement in pijul/src/commands/identity.rs at line 184 [20.40825]

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

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

Insertion in pijul/src/commands/git.rs at line 45 [2.137210]

Insertion in pijul/src/commands/fork.rs at line 1 [2.167873]

Insertion in pijul/src/commands/fork.rs at line 28 [2.167873]

Insertion in pijul/src/commands/file_operations.rs at line 28 [2.169058]

Insertion in pijul/src/commands/file_operations.rs at line 102 [2.169058]

Insertion in pijul/src/commands/file_operations.rs at line 141 [2.169058]

Insertion in pijul/src/commands/file_operations.rs at line 228 [2.169058]

Replacement in pijul/src/commands/diff.rs at line 3 [2.173551]

Insertion in pijul/src/commands/diff.rs at line 42 [2.173551]

Insertion in pijul/src/commands/dependents.rs at line 4 [22.243]

Insertion in pijul/src/commands/dependents.rs at line 20 [22.243]

Insertion in pijul/src/commands/debug.rs at line 7 [2.177758]

Insertion in pijul/src/commands/debug.rs at line 19 [2.177758]

Replacement in pijul/src/commands/credit.rs at line 2 [2.178684]

Insertion in pijul/src/commands/credit.rs at line 25 [2.178684]

Replacement in pijul/src/commands/clone.rs at line 1 [2.182891]

Insertion in pijul/src/commands/clone.rs at line 37 [2.182891]

Insertion in pijul/src/commands/client.rs at line 7 [23.4568]

Insertion in pijul/src/commands/client.rs at line 19 [23.4568]

Insertion in pijul/src/commands/channel.rs at line 2 [2.186892]

Insertion in pijul/src/commands/channel.rs at line 56 [2.186892]

Insertion in pijul/src/commands/change.rs at line 1 [2.189306]

Insertion in pijul/src/commands/change.rs at line 22 [2.189306]

Insertion in pijul/src/commands/archive.rs at line 5 [2.191083]

Insertion in pijul/src/commands/archive.rs at line 41 [2.191083]

Replacement in pijul/src/commands/apply.rs at line 1 [2.194289]

Insertion in pijul/src/commands/apply.rs at line 27 [2.194289]