pijul/pijul - Change GKSVBEUW7Q2M4QPKPHOUPGP36AMXMJVGX7KCSNYXEFQZOURGBSMQC

Refactor Repository constructors to take Option<&Path> instead of Option<PathBuf>

Created by dblsaiko on March 30, 2024

GKSVBEUW7Q2M4QPKPHOUPGP36AMXMJVGX7KCSNYXEFQZOURGBSMQC

Dependencies

In discussions

#918 Refactor repository and channel handling in CLI commands

#921 Skip downloading already locally available changes + change paths cleanup

Change contents

Insertion in pijul-repository/src/lib.rs at line 1 [7.21431]
[7.21431]
[5.0]
```
use std::borrow::Cow;
```
Replacement in pijul-repository/src/lib.rs at line 3 [7.21431]
∅:D[5.27] → [7.21516:21540]
B:BD[7.21516] → [7.21516:21540]
```
use std::path::PathBuf;
```
[5.27]
[7.21540]
```
use std::path::{Path, PathBuf};
```

Replacement in pijul-repository/src/lib.rs at line 49 [7.21431]

B:BD[7.22284] → [7.22284:22375]

    fn find_root_(cur: Option<PathBuf>, dot_dir: &str) -> Result<PathBuf, anyhow::Error> {

[7.22013]

[7.22375]

    fn find_root_(cur: Option<&Path>, dot_dir: &str) -> Result<PathBuf, anyhow::Error> {

Replacement in pijul-repository/src/lib.rs at line 51 [7.21431]
B:BD[7.22422] → [7.22422:22438]
```
            cur
```
[7.22422]
[7.22438]
```
            cur.to_path_buf()
```

Replacement in pijul-repository/src/lib.rs at line 72 [7.21431]

B:BD[7.22907] → [8.0:76]

    pub fn find_root(cur: Option<PathBuf>) -> Result<Self, anyhow::Error> {

[7.22907]

[8.76]

    pub fn find_root(cur: Option<&Path>) -> Result<Self, anyhow::Error> {

Replacement in pijul-repository/src/lib.rs at line 77 [7.21431]
∅:D[8.163] → [7.23076:23106]
∅:D[9.1279] → [7.23076:23106]
B:BD[7.23076] → [7.23076:23106]
```
        cur: Option<PathBuf>,
```
[8.163]
[7.23106]
```
        cur: Option<&Path>,
```

Replacement in pijul-repository/src/lib.rs at line 81 [7.21431]

B:BD[7.23219] → [7.23219:23466]

        let mut pristine_dir = cur.clone();
        pristine_dir.push(PRISTINE_DIR);
        let mut changes_dir = cur.clone();
        changes_dir.push(CHANGES_DIR);
        let mut working_copy_dir = cur.clone();
        working_copy_dir.pop();

[7.23219]

[7.23466]

        let pristine_dir = cur.join(PRISTINE_DIR);
        let changes_dir = cur.join(CHANGES_DIR);
        let working_copy_dir = cur.parent().unwrap();

Replacement in pijul-repository/src/lib.rs at line 104 [7.21431]
B:BD[7.24220] → [7.24220:24256]
```
            path: working_copy_dir,
```
[7.24220]
[7.24256]
```
            path: working_copy_dir.to_path_buf(),
```
Replacement in pijul-repository/src/lib.rs at line 110 [7.21431]
B:BD[10.364] → [10.364:406]
```
        path: Option<std::path::PathBuf>,
```
[10.364]
[11.0]
```
        path: Option<&Path>,
```
Replacement in pijul-repository/src/lib.rs at line 117 [7.21431]
B:BD[7.24427] → [7.24427:24444]
```
            path
```
[7.24427]
[7.24444]
```
            Cow::Borrowed(path)
```
Replacement in pijul-repository/src/lib.rs at line 119 [7.21431]
B:BD[7.24461] → [7.24461:24488]
```
            current_dir()?
```
[7.24461]
[7.24488]
```
            Cow::Owned(current_dir()?)
```

Replacement in pijul-repository/src/lib.rs at line 121 [7.21431]

B:BD[7.24499] → [12.65:231]

        let pristine_dir = {
            let mut base = cur.clone();
            base.push(DOT_DIR);
            base.push(PRISTINE_DIR);
            base
        };

[7.24499]

[7.24620]


        let pristine_dir = cur.join(DOT_DIR).join(PRISTINE_DIR);

Replacement in pijul-repository/src/lib.rs at line 126 [7.21431]

B:BD[7.24728] → [10.477:526]

            init_dot_ignore(cur.clone(), kind)?;

[7.24728]

[11.59]

            init_dot_ignore(&cur, kind)?;

Replacement in pijul-repository/src/lib.rs at line 128 [7.21431]

∅:D[11.107] → [12.275:463]

∅:D[10.526] → [12.275:463]

B:BD[12.275] → [12.275:463]

            let changes_dir = {
                let mut base = cur.clone();
                base.push(DOT_DIR);
                base.push(CHANGES_DIR);
                base
            };

[11.107]

[13.30]


            let changes_dir = cur.join(DOT_DIR).join(CHANGES_DIR);

Replacement in pijul-repository/src/lib.rs at line 142 [7.21431]
B:BD[7.25208] → [7.25208:25235]
```
                path: cur,
```
[7.25208]
[7.25235]
```
                path: cur.into_owned(),
```

Replacement in pijul-repository/src/lib.rs at line 159 [7.21431]

B:BD[12.465] → [11.108:208]

fn init_default_config(path: &std::path::Path, remote: Option<&str>) -> Result<(), anyhow::Error> {

[12.465]

[11.208]

fn init_default_config(path: &Path, remote: Option<&str>) -> Result<(), anyhow::Error> {

Replacement in pijul-repository/src/lib.rs at line 175 [7.21431]

B:BD[12.608] → [11.559:660]

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

[12.608]

[12.689]

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

Replacement in pijul-repository/src/lib.rs at line 177 [7.21431]

B:BD[12.713] → [12.713:833]

    let dot_ignore_path = {
        let mut base = base_path.clone();
        base.push(".ignore");
        base
    };

[12.713]

[12.833]

    let dot_ignore_path = base_path.join(".ignore");

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

∅:D[14.1080] → [8.13337:13400]

B:BD[9.5722] → [8.13337:13400]

        let mut repo = Repository::find_root(self.repo_path)?;

[14.1080]

[7.96236]

        let mut repo = Repository::find_root(self.repo_path.as_deref())?;

Replacement in pijul/src/commands/tag.rs at line 96 [17.74]

B:BD[15.92] → [16.532:598]

                let mut repo = Repository::find_root(repo_path)?;

[15.92]

[18.2428]

                let mut repo = Repository::find_root(repo_path.as_deref())?;

Replacement in pijul/src/commands/tag.rs at line 143 [17.74]

B:BD[19.113] → [16.627:689]

                let repo = Repository::find_root(repo_path)?;

[19.113]

[20.150]

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

Replacement in pijul/src/commands/tag.rs at line 168 [17.74]

B:BD[21.5659] → [21.5659:5721]

                let repo = Repository::find_root(repo_path)?;

[21.5659]

[20.369]

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

Replacement in pijul/src/commands/tag.rs at line 206 [17.74]

B:BD[2.820] → [2.820:882]

                let repo = Repository::find_root(repo_path)?;

[2.820]

[2.882]

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

Replacement in pijul/src/commands/tag.rs at line 237 [17.74]

B:BD[15.268] → [22.26544:26611]

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

[15.268]

[15.440]

                let repo = Repository::find_root(self.repo_path.as_deref())?;

Replacement in pijul/src/commands/reset.rs at line 56 [7.97650]

B:BD[7.98218] → [8.13851:13910]

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

[7.98218]

[18.3338]

        let repo = Repository::find_root(self.repo_path.as_deref())?;

Replacement in pijul/src/commands/record.rs at line 73 [7.101759]
∅:D[23.536] → [8.13911:13978]
∅:D[14.1422] → [8.13911:13978]
B:BD[7.102832] → [8.13911:13978]
```
        let repo = Repository::find_root(self.repo_path.clone())?;
```
[23.536]
[7.102903]
```
        let repo = Repository::find_root(self.repo_path.as_deref())?;
```
Replacement in pijul/src/commands/pushpull.rs at line 184 [7.111631]
∅:D[14.1475] → [8.14593:14652]
B:BD[9.6472] → [8.14593:14652]
```
        let repo = Repository::find_root(self.repo_path)?;
```
[14.1475]
[7.112314]
```
        let repo = Repository::find_root(self.repo_path.as_deref())?;
```

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

B:BD[24.1981] → [25.20068:20135]

        let repo = Repository::find_root(self.repo_path.clone())?;

[24.1981]

[7.114570]

        let repo = Repository::find_root(self.repo_path.as_deref())?;

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

B:BD[7.117585] → [25.21787:21858]

        let mut repo = Repository::find_root(self.repo_path.clone())?;

[7.117585]

[18.9020]

        let mut repo = Repository::find_root(self.repo_path.as_deref())?;

Replacement in pijul/src/commands/protocol.rs at line 55 [7.123281]

∅:D[14.1528] → [8.15774:15837]

B:BD[9.6860] → [8.15774:15837]

        let mut repo = Repository::find_root(self.repo_path)?;

[14.1528]

[6.3472]

        let mut repo = Repository::find_root(self.repo_path.as_deref())?;

Insertion in pijul/src/commands/mod.rs at line 2 [7.133619]
[8.19773]
[8.19773]
```
mod common_opts;
```
Insertion in pijul/src/commands/mod.rs at line 74 [7.133619]
[26.155]
[26.155]

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

B:BD[27.245] → [27.245:311]

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

[27.245]

[27.354]

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

Replacement in pijul/src/commands/init.rs at line 25 [7.136543]

B:BD[14.1824] → [11.686:763]

        let repo = Repository::init(self.path, self.kind.as_deref(), None)?;

[14.1824]

[28.512]

        let repo = Repository::init(self.path.as_deref(), self.kind.as_deref(), None)?;

Replacement in pijul/src/commands/fork.rs at line 28 [7.167873]
∅:D[14.1926] → [8.23679:23738]
B:BD[9.14628] → [8.23679:23738]
```
        let repo = Repository::find_root(self.repo_path)?;
```
[14.1926]
[7.168420]
```
        let repo = Repository::find_root(self.repo_path.as_deref())?;
```
Replacement in pijul/src/commands/file_operations.rs at line 97 [7.169058]
∅:D[14.2036] → [8.23807:23866]
B:BD[9.14968] → [8.23807:23866]
```
        let repo = Repository::find_root(self.repo_path)?;
```
[14.2036]
[7.170979]
```
        let repo = Repository::find_root(self.repo_path.as_deref())?;
```

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

∅:D[14.2199] → [8.24003:24070]

B:BD[9.15461] → [8.24003:24070]

        let repo = Repository::find_root(self.repo_path.clone())?;

[14.2199]

[18.15999]

        let repo = Repository::find_root(self.repo_path.as_deref())?;

Replacement in pijul/src/commands/dependents.rs at line 20 [29.243]

B:BD[29.759] → [29.759:826]

        let repo = Repository::find_root(self.repo_path.clone())?;

[29.759]

[29.826]

        let repo = Repository::find_root(self.repo_path.as_deref())?;

Replacement in pijul/src/commands/debug.rs at line 22 [7.177758]
∅:D[14.2252] → [8.24133:24192]
B:BD[9.15597] → [8.24133:24192]
```
        let repo = Repository::find_root(self.repo_path)?;
```
[14.2252]
[7.178130]
```
        let repo = Repository::find_root(self.repo_path.as_deref())?;
```

Replacement in pijul/src/commands/credit.rs at line 30 [7.178684]

B:BD[7.179239] → [8.24247:24306]

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

[7.179239]

[4.999]

        let repo = Repository::find_root(self.repo_path.as_deref())?;

Replacement in pijul/src/commands/clone.rs at line 85 [7.182891]

B:BD[3.321] → [3.321:407]

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

[3.321]

[18.16742]

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

Replacement in pijul/src/commands/channel.rs at line 53 [7.186892]

B:BD[7.187735] → [8.24512:24579]

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

[7.187735]

                let repo = Repository::find_root(self.repo_path.as_deref())?;

Replacement in pijul/src/commands/channel.rs at line 67 [7.186892]

B:BD[7.188244] → [8.24580:24647]

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

[7.188244]

[30.3917]

                let repo = Repository::find_root(self.repo_path.as_deref())?;

Replacement in pijul/src/commands/channel.rs at line 89 [7.186892]

B:BD[7.188456] → [8.24648:24715]

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

[7.188456]

[28.960]

                let repo = Repository::find_root(self.repo_path.as_deref())?;

Replacement in pijul/src/commands/channel.rs at line 112 [7.186892]

∅:D[31.391] → [8.24716:24783]

B:BD[32.155] → [8.24716:24783]

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

[31.391]

[32.228]

                let repo = Repository::find_root(self.repo_path.as_deref())?;

Replacement in pijul/src/commands/change.rs at line 21 [7.189306]

∅:D[14.2495] → [8.24784:24851]

B:BD[9.16397] → [8.24784:24851]

        let repo = Repository::find_root(self.repo_path.clone())?;

[14.2495]

[7.189800]

        let repo = Repository::find_root(self.repo_path.as_deref())?;

Replacement in pijul/src/commands/archive.rs at line 100 [7.191083]

B:BD[33.8987] → [8.24875:24949]

        if let Ok(repo) = Repository::find_root(self.repo_path.clone()) {

[33.8987]

[7.193066]

        if let Ok(repo) = Repository::find_root(self.repo_path.as_deref()) {

Replacement in pijul/src/commands/apply.rs at line 27 [7.194289]
∅:D[14.2548] → [8.24950:25009]
B:BD[9.16631] → [8.24950:25009]
```
        let repo = Repository::find_root(self.repo_path)?;
```
[14.2548]
[34.407]
```
        let repo = Repository::find_root(self.repo_path.as_deref())?;
```

Refactor Repository constructors to take Option<&Path> instead of Option<PathBuf>

Dependencies

In discussions

Change contents

Insertion in pijul-repository/src/lib.rs at line 1 [7.21431]

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

Replacement in pijul-repository/src/lib.rs at line 49 [7.21431]

Replacement in pijul-repository/src/lib.rs at line 51 [7.21431]

Replacement in pijul-repository/src/lib.rs at line 72 [7.21431]

Replacement in pijul-repository/src/lib.rs at line 77 [7.21431]

Replacement in pijul-repository/src/lib.rs at line 81 [7.21431]

Replacement in pijul-repository/src/lib.rs at line 104 [7.21431]

Replacement in pijul-repository/src/lib.rs at line 110 [7.21431]

Replacement in pijul-repository/src/lib.rs at line 117 [7.21431]

Replacement in pijul-repository/src/lib.rs at line 119 [7.21431]