dblsaiko/pijul - Change UDGL7ER2R6SY2CBSPA4O4ULQ5PCUDWQBGYOWTN3MQGSS5L2EI2LQC

Clean up change file name handling

Removes the filesystem::push_filename and pop_filename methods in favor of fmt_filename which does not modify the original string, plus other similar changes like that which allow code to no longer have to worry about returning the string it's borrowing back to its original state, especially in case of branching.

Created by dblsaiko on April 1, 2024

UDGL7ER2R6SY2CBSPA4O4ULQ5PCUDWQBGYOWTN3MQGSS5L2EI2LQC

Dependencies

In channels

main

Change contents

Replacement in pijul-remote/src/ssh.rs at line 4 [8.25380]
B:BD[8.25667] → [9.1863:1887]
```
use std::path::PathBuf;
```
[8.25667]
[10.0]
```
use std::path::{Path, PathBuf};
```
Insertion in pijul-remote/src/ssh.rs at line 12 [8.25380]
[11.156]
[12.32]
```
use libpijul::changestore::filesystem::fmt_filename;
```
Replacement in pijul-remote/src/ssh.rs at line 343 [8.25380]
B:BD[10.492] → [13.0:29]
```
        final_path: PathBuf,
```
[10.492]
[14.166]
```
        destdir: PathBuf,
```

Replacement in pijul-remote/src/ssh.rs at line 524 [8.25380]

B:BD[10.2696] → [13.30:70]

                    ref mut final_path,

[10.2696]

                    ref destdir,

Insertion in pijul-remote/src/ssh.rs at line 528 [8.25380]
[10.2788]
[15.89]
```
                    let mut buf = PathBuf::new();
```

Replacement in pijul-remote/src/ssh.rs at line 549 [8.25380]

B:BD[14.692] → [14.692:1149]

                                    libpijul::changestore::filesystem::push_filename(final_path, h);
                                    debug!("moving {:?} to {:?}", path, final_path);
                                    std::fs::create_dir_all(&final_path.parent().unwrap())?;
                                    let r = std::fs::rename(&path, &final_path);
                                    libpijul::changestore::filesystem::pop_filename(final_path);

[14.692]

[14.1149]

                                    let p = fmt_filename(&mut buf, &destdir, &h);
                                    debug!("moving {:?} to {:?}", path, p);
                                    std::fs::create_dir_all(&p.parent().unwrap())?;
                                    let r = std::fs::rename(&path, &p);

Replacement in pijul-remote/src/ssh.rs at line 556 [8.25380]

B:BD[14.1273] → [14.1273:1814]

                                    libpijul::changestore::filesystem::push_tag_filename(
                                        final_path, &h,
                                    );
                                    debug!("moving {:?} to {:?}", path, final_path);
                                    std::fs::create_dir_all(&final_path.parent().unwrap())?;
                                    let r = std::fs::rename(&path, &final_path);
                                    libpijul::changestore::filesystem::pop_filename(final_path);

[14.1273]

[14.1814]

                                    let p = fmt_filename(&mut buf, &destdir, &h);
                                    debug!("moving {:?} to {:?}", path, p);
                                    std::fs::create_dir_all(&p.parent().unwrap())?;
                                    let r = std::fs::rename(&path, &p);

Replacement in pijul-remote/src/ssh.rs at line 583 [8.25380]

B:BD[10.5342] → [3.0:135]

B:BD[3.135] → [3.135:179]

B:BD[3.179] → [3.179:259]

                            trace!(
                                "writing to {:?} {:?} {:?}",
                                path,
                                final_path,
                                hashes[*current]
                            );

[10.5342]

[3.259]

                            trace!("writing to {:?} {:?} {:?}", path, destdir, hashes[*current]);

Replacement in pijul-remote/src/ssh.rs at line 934 [8.25380]
∅:D[16.22] → [8.44372:44400]
∅:D[17.82] → [8.44372:44400]
B:BD[8.44372] → [8.44372:44400]
```
        mut local: PathBuf,
```
[17.82]
[8.44400]
```
        changes_dir: &Path,
```
Insertion in pijul-remote/src/ssh.rs at line 938 [8.25380]
[8.44497]
[8.44497]
```
        let mut buf = PathBuf::new();
```

Replacement in pijul-remote/src/ssh.rs at line 950 [8.25380]

B:BD[14.2148] → [14.2148:2306]

                    libpijul::changestore::filesystem::push_filename(&mut local, &c);
                    let mut change_file = std::fs::File::open(&local)?;

[14.2148]

[14.2306]

                    let p = fmt_filename(&mut buf, &changes_dir, &c);
                    let mut change_file = std::fs::File::open(&p)?;

Deletion in pijul-remote/src/ssh.rs at line 963 [8.25380]

B:BD[14.2875] → [14.2875:2956]

                    libpijul::changestore::filesystem::pop_filename(&mut local);

Replacement in pijul-remote/src/ssh.rs at line 965 [8.25380]

B:BD[14.3008] → [14.3008:3184]

                    libpijul::changestore::filesystem::push_tag_filename(&mut local, &c);
                    let mut tag_file = libpijul::tag::OpenTagFile::open(&local, &c)?;

[14.3008]

[14.3184]

                    let p = fmt_filename(&mut buf, &changes_dir, &c);
                    let mut tag_file = libpijul::tag::OpenTagFile::open(&p, &c)?;

Deletion in pijul-remote/src/ssh.rs at line 976 [8.25380]

B:BD[14.3575] → [14.3575:3656]

                    libpijul::changestore::filesystem::pop_filename(&mut local);

Replacement in pijul-remote/src/ssh.rs at line 988 [8.25380]
∅:D[18.60] → [10.8820:8855]
∅:D[14.3799] → [10.8820:8855]
B:BD[10.8820] → [10.8820:8855]
```
        changes_dir: &mut PathBuf,
```
[18.60]
[8.45507]
```
        changes_dir: &Path,
```
Replacement in pijul-remote/src/ssh.rs at line 1000 [8.25380]
∅:D[18.129] → [19.334:369]
∅:D[20.536] → [19.334:369]
∅:D[14.3918] → [19.334:369]
B:BD[19.334] → [19.334:369]
```
        changes_dir: &mut PathBuf,
```
[18.129]
[19.369]
```
        changes_dir: &Path,
```
Replacement in pijul-remote/src/ssh.rs at line 1004 [8.25380]
B:BD[10.8923] → [13.671:715]
```
        let path = changes_dir.join("tmp");
```
[10.8923]
[13.715]
```
        let tmp_file = changes_dir.join("tmp");
```
Replacement in pijul-remote/src/ssh.rs at line 1006 [8.25380]
∅:D[21.95] → [10.9044:9094]
∅:D[13.763] → [10.9044:9094]
B:BD[8.46580] → [10.9044:9094]
```
        let file = std::fs::File::create(&path)?;
```
[13.763]
[10.9094]
```
        let file = std::fs::File::create(&tmp_file)?;
```

Replacement in pijul-remote/src/ssh.rs at line 1010 [8.25380]

B:BD[10.9211] → [10.9211:9229]

B:BD[10.9229] → [13.764:809]

            path,
            final_path: changes_dir.clone(),

[10.9211]

[10.9229]

            path: tmp_file,
            destdir: changes_dir.to_path_buf(),

Replacement in pijul-remote/src/local.rs at line 2 [8.79745]
∅:D[22.63] → [10.11563:11587]
∅:D[23.291] → [10.11563:11587]
∅:D[12.4234] → [10.11563:11587]
B:BD[8.79745] → [10.11563:11587]
```
use std::path::PathBuf;
```
[22.63]
[24.918]
```
use std::path::{Path, PathBuf};
```
Insertion in pijul-remote/src/local.rs at line 6 [8.79745]
[25.425]
[26.9780]
```
use libpijul::changestore::filesystem::fmt_filename;
```
Replacement in pijul-remote/src/local.rs at line 212 [8.79745]
B:BD[8.82124] → [8.82124:82143]
```
        &mut self,
```
[8.82124]
[17.3424]
```
        &self,
```
Replacement in pijul-remote/src/local.rs at line 214 [8.79745]
∅:D[16.831] → [8.82143:82171]
∅:D[17.3459] → [8.82143:82171]
B:BD[8.82143] → [8.82143:82171]
```
        mut local: PathBuf,
```
[17.3459]
[8.82171]
```
        changes_dir: &Path,
```

Insertion in pijul-remote/src/local.rs at line 218 [8.79745]

[8.82268]

[27.1182]

        let mut buf = PathBuf::new();
        let mut buf2 = PathBuf::new();

Replacement in pijul-remote/src/local.rs at line 230 [8.79745]

B:BD[8.82584] → [14.21554:21794]

            match c {
                CS::Change(c) => {
                    libpijul::changestore::filesystem::push_filename(&mut local, &c);
                    libpijul::changestore::filesystem::push_filename(&mut self.changes_dir, &c);

[8.82584]

[14.21794]

            let src = fmt_filename(&mut buf, &changes_dir, c);
            let dest = fmt_filename(&mut buf2, &changes_dir, c);
            std::fs::create_dir_all(&dest.parent().unwrap())?;
            debug!("hard link {:?} {:?}", src, dest);
            if std::fs::metadata(&dest).is_err() {
                if std::fs::hard_link(&src, &dest).is_err() {
                    std::fs::copy(&src, &dest)?;

Deletion in pijul-remote/src/local.rs at line 239 [8.79745]

B:BD[14.21812] → [14.21812:22055]

                CS::State(c) => {
                    libpijul::changestore::filesystem::push_tag_filename(&mut local, &c);
                    libpijul::changestore::filesystem::push_tag_filename(&mut self.changes_dir, &c);
                }

Deletion in pijul-remote/src/local.rs at line 240 [8.79745]

∅:D[14.22069] → [8.82751:82894]

B:BD[8.82751] → [8.82751:82894]

B:BD[8.82894] → [2.0:220]

∅:D[2.220] → [28.3529:3543]

B:BD[28.3529] → [28.3529:3543]

            std::fs::create_dir_all(&self.changes_dir.parent().unwrap())?;
            debug!("hard link {:?} {:?}", local, self.changes_dir);
            if std::fs::metadata(&self.changes_dir).is_err() {
                if std::fs::hard_link(&local, &self.changes_dir).is_err() {
                    std::fs::copy(&local, &self.changes_dir)?;
                }
            }

Deletion in pijul-remote/src/local.rs at line 241 [8.79745]

B:BD[14.22108] → [14.22108:22265]

            libpijul::changestore::filesystem::pop_filename(&mut local);
            libpijul::changestore::filesystem::pop_filename(&mut self.changes_dir);

Replacement in pijul-remote/src/local.rs at line 260 [8.79745]
∅:D[10.11726] → [8.83493:83512]
B:BD[8.83493] → [8.83493:83512]
```
        &mut self,
```
[10.11726]
[17.3546]
```
        &self,
```
Replacement in pijul-remote/src/local.rs at line 264 [8.79745]
∅:D[18.1462] → [10.11839:11871]
∅:D[14.22379] → [10.11839:11871]
B:BD[10.11839] → [10.11839:11871]
```
        mut path: &mut PathBuf,
```
[18.1462]
[8.83570]
```
        dest_dir: &Path,
```

Insertion in pijul-remote/src/local.rs at line 266 [8.79745]

[8.83607]

[15.2842]

        let mut buf = PathBuf::new();
        let mut buf2 = PathBuf::new();

Replacement in pijul-remote/src/local.rs at line 270 [8.79745]

B:BD[15.2892] → [29.601:840]

∅:D[29.840] → [14.22880:22898]

B:BD[14.22880] → [14.22880:22898]

B:BD[14.22898] → [29.841:1065]

∅:D[29.1065] → [14.23102:23120]

B:BD[14.23102] → [14.23102:23120]

B:BD[14.23120] → [29.1066:1080]

            match c {
                CS::Change(c) => {
                    libpijul::changestore::filesystem::push_filename(&mut self.changes_dir, &c);
                    libpijul::changestore::filesystem::push_filename(&mut path, &c);
                }
                CS::State(c) => {
                    libpijul::changestore::filesystem::push_tag_filename(&mut self.changes_dir, &c);
                    libpijul::changestore::filesystem::push_tag_filename(&mut path, &c);
                }
            }

[15.2892]

[17.3582]

            let src = fmt_filename(&mut buf, &self.changes_dir, &c);
            let dest = fmt_filename(&mut buf2, &dest_dir, &c);

Replacement in pijul-remote/src/local.rs at line 275 [8.79745]

∅:D[17.3616] → [29.1145:1245]

B:BD[29.1145] → [29.1145:1245]

B:BD[29.1245] → [7.3316:3404]

∅:D[29.1245] → [10.12157:12233]

∅:D[7.3404] → [10.12157:12233]

∅:D[14.23250] → [10.12157:12233]

B:BD[10.12157] → [10.12157:12233]

            if std::fs::metadata(&path).is_ok() {
                debug!("metadata {:?} ok", path);
                libpijul::changestore::filesystem::pop_filename(&mut self.changes_dir);
                libpijul::changestore::filesystem::pop_filename(&mut path);

[17.3616]

[7.3405]

            if std::fs::metadata(&dest).is_ok() {
                debug!("metadata {:?} ok", dest);

Replacement in pijul-remote/src/local.rs at line 280 [8.79745]

B:BD[29.1286] → [29.1286:1478]

            std::fs::create_dir_all(&path.parent().unwrap())?;
            if std::fs::hard_link(&self.changes_dir, &path).is_err() {
                std::fs::copy(&self.changes_dir, &path)?;

[29.1286]

[10.12464]

            std::fs::create_dir_all(&dest.parent().unwrap())?;
            if std::fs::hard_link(&src, &dest).is_err() {
                std::fs::copy(&src, &dest)?;

Replacement in pijul-remote/src/local.rs at line 284 [8.79745]

B:BD[29.1517] → [29.1517:1673]

            libpijul::changestore::filesystem::pop_filename(&mut self.changes_dir);
            libpijul::changestore::filesystem::pop_filename(&mut path);

[10.12478]

[18.1510]

Insertion in pijul-remote/src/lib.rs at line 9 [8.52474]

[30.393]

[31.0]

use libpijul::changestore::filesystem;
use libpijul::changestore::filesystem::fmt_filename;

Insertion in pijul-remote/src/lib.rs at line 51 [8.52474]

[8.52850]


impl filesystem::CacheEntry for CS {
    fn hash(&self) -> String {
        match self {
            CS::Change(v) => v.hash(),
            CS::State(v) => v.hash(),
        }
    }

Insertion in pijul-remote/src/lib.rs at line 60 [8.52474]

[8.52851]

[32.26]

    fn ext(&self) -> &str {
        match self {
            CS::Change(v) => v.ext(),
            CS::State(v) => v.ext(),
        }
    }
}

Replacement in pijul-remote/src/lib.rs at line 1131 [8.52474]
B:BD[28.2441] → [33.662:686]
```
        local: PathBuf,
```
[28.2441]
[8.65227]
```
        changes_dir: &Path,
```

Replacement in pijul-remote/src/lib.rs at line 1139 [8.52474]

B:BD[17.570] → [17.570:644]

                l.upload_changes(upload_bar, local, to_channel, changes)?

[17.570]

[17.644]

                l.upload_changes(upload_bar, &changes_dir, to_channel, changes)?

Replacement in pijul-remote/src/lib.rs at line 1142 [8.52474]

B:BD[16.496] → [17.659:732]

                s.upload_changes(upload_bar, local, to_channel, changes)

[16.496]

[17.732]

                s.upload_changes(upload_bar, &changes_dir, to_channel, changes)

Replacement in pijul-remote/src/lib.rs at line 1146 [8.52474]

B:BD[17.815] → [17.815:888]

                h.upload_changes(upload_bar, local, to_channel, changes)

[17.815]

[17.888]

                h.upload_changes(upload_bar, &changes_dir, to_channel, changes)

Replacement in pijul-remote/src/lib.rs at line 1152 [8.52474]

B:BD[27.925] → [27.925:952]

                    local,

[27.925]

[32.623]

                    changes_dir.to_path_buf(),

Replacement in pijul-remote/src/lib.rs at line 1168 [8.52474]
∅:D[18.256] → [8.66747:66775]
∅:D[10.10772] → [8.66747:66775]
∅:D[14.16081] → [8.66747:66775]
B:BD[8.66747] → [8.66747:66775]
```
        path: &mut PathBuf,
```
[18.256]
[8.66775]
```
        path: &Path,
```

Deletion in pijul-remote/src/lib.rs at line 1245 [8.52474]

∅:D[20.2757] → [15.1348:1472]

B:BD[15.1348] → [15.1348:1472]

        let mut change_path_ = repo.path.clone();
        change_path_.push(DOT_DIR);
        change_path_.push("changes");

Insertion in pijul-remote/src/lib.rs at line 1246 [8.52474]
[17.1694]
[15.1472]
```
        let mut changes_dir = repo.changes_dir.clone();
```

Replacement in pijul-remote/src/lib.rs at line 1253 [8.52474]

B:BD[17.1838] → [17.1838:1877]

                    &mut change_path_,

[17.1838]

[17.1877]

                    &mut changes_dir,

Deletion in pijul-remote/src/lib.rs at line 1261 [8.52474]
B:BD[8.69054] → [8.69054:69111]
```
        let mut change_path_ = repo.changes_dir.clone();
```

Replacement in pijul-remote/src/lib.rs at line 1267 [8.52474]

∅:D[34.118] → [29.0:297]

B:BD[35.259] → [29.0:297]

∅:D[29.297] → [14.16450:16468]

B:BD[14.16450] → [14.16450:16468]

∅:D[29.448] → [35.440:454]

∅:D[15.1793] → [35.440:454]

∅:D[20.3173] → [35.440:454]

∅:D[14.16552] → [35.440:454]

B:BD[35.440] → [35.440:454]

            match h {
                CS::Change(h) => {
                    libpijul::changestore::filesystem::push_filename(&mut change_path_, h);
                }
                CS::State(h) => {
                    libpijul::changestore::filesystem::push_tag_filename(&mut change_path_, h);
                }
            }

[34.118]

[36.41]

Deletion in pijul-remote/src/lib.rs at line 1271 [8.52474]
∅:D[34.178] → [29.449:529]
B:BD[35.454] → [29.449:529]
```
            libpijul::changestore::filesystem::pop_filename(&mut change_path_);
```

Replacement in pijul-remote/src/lib.rs at line 1355 [8.52474]

B:BD[37.1156] → [37.1156:1209]

        let mut dep_path = repo.changes_dir.clone();

[34.478]

[37.1209]

        let changes_dir = repo.changes_dir.clone();

Insertion in pijul-remote/src/lib.rs at line 1358 [8.52474]
[37.1295]
[38.0]
```
            let mut buf = PathBuf::new();
```

Replacement in pijul-remote/src/lib.rs at line 1374 [8.52474]

B:BD[37.1957] → [37.1957:2056]

                            libpijul::changestore::filesystem::push_filename(&mut dep_path, &dep);

[37.1957]

[37.2056]

                            let dep_path = fmt_filename(&mut buf, &changes_dir, &dep);

Deletion in pijul-remote/src/lib.rs at line 1376 [8.52474]

B:BD[37.2136] → [37.2136:2228]

                            libpijul::changestore::filesystem::pop_filename(&mut dep_path);

Insertion in pijul-remote/src/http.rs at line 2 [40.10]
[26.11135]
[39.2210]
```
use libpijul::changestore::filesystem::fmt_filename;
```
Replacement in pijul-remote/src/http.rs at line 8 [40.10]
B:BD[41.1932] → [41.1932:1956]
```
use std::path::PathBuf;
```
[41.1932]
[14.23928]
```
use std::path::{Path, PathBuf};
use std::sync::Arc;
```
Replacement in pijul-remote/src/http.rs at line 28 [40.10]
∅:D[42.1215] → [43.101:124]
∅:D[41.2034] → [43.101:124]
B:BD[43.101] → [43.101:124]
```
    mut path: PathBuf,
```
[41.2034]
[14.23953]
```
    base_dir: impl AsRef<Path>,
```

Insertion in pijul-remote/src/http.rs at line 31 [40.10]

[14.23997]

    let base_dir = base_dir.as_ref();
    let mut buf = PathBuf::new();
    let path = fmt_filename(&mut buf, &base_dir, &c);

Replacement in pijul-remote/src/http.rs at line 36 [40.10]

B:BD[14.24028] → [14.24028:24180]

        CS::Change(c) => {
            libpijul::changestore::filesystem::push_filename(&mut path, &c);
            ("change", c.to_base32())
        }

[14.24028]

[14.24180]

        CS::Change(c) => ("change", c.to_base32()),

Deletion in pijul-remote/src/http.rs at line 38 [40.10]

B:BD[14.24206] → [14.24206:24287]

            libpijul::changestore::filesystem::push_tag_filename(&mut path, &c);

Replacement in pijul-remote/src/http.rs at line 152 [40.10]
∅:D[18.1649] → [43.1436:1460]
∅:D[14.24836] → [43.1436:1460]
B:BD[44.1252] → [43.1436:1460]
```
        path: &PathBuf,
```
[18.1649]
[44.1280]
```
        path: &Path,
```

Insertion in pijul-remote/src/http.rs at line 155 [40.10]

[44.1338]

[36.925]

        let path: Arc<Path> = Arc::from(path.to_path_buf().into_boxed_path());

Replacement in pijul-remote/src/http.rs at line 229 [40.10]
∅:D[16.1014] → [33.876:904]
∅:D[17.4026] → [33.876:904]
B:BD[33.876] → [33.876:904]
```
        mut local: PathBuf,
```
[17.4026]
[33.904]
```
        changes_dir: &Path,
```
Insertion in pijul-remote/src/http.rs at line 233 [40.10]
[33.1011]
[33.1121]
```
        let mut buf = PathBuf::new();
```

Insertion in pijul-remote/src/http.rs at line 252 [40.10]

[14.24886]

            let local = fmt_filename(&mut buf, &changes_dir, &c);

Deletion in pijul-remote/src/http.rs at line 256 [40.10]

B:BD[14.24954] → [14.24954:25040]

                    libpijul::changestore::filesystem::push_filename(&mut local, &c);

Deletion in pijul-remote/src/http.rs at line 262 [40.10]

B:BD[14.25277] → [14.25277:25367]

                    libpijul::changestore::filesystem::push_tag_filename(&mut local, &c);

Deletion in pijul-remote/src/http.rs at line 270 [40.10]
B:BD[14.25698] → [14.25698:25771]
```
            libpijul::changestore::filesystem::pop_filename(&mut local);
```

Replacement in pijul/src/commands/tag.rs at line 8 [45.74]

B:BD[45.255] → [24.2342:2427]

use libpijul::{ArcTxn, Base32, ChannelMutTxnT, ChannelTxnT, MutTxnT, TxnT, TxnTExt};

[45.255]

[46.0]

use libpijul::changestore::filesystem::fmt_filename;
use libpijul::{ArcTxn, Base32, ChannelMutTxnT, ChannelTxnT, Merkle, MutTxnT, TxnT, TxnTExt};

Deletion in pijul/src/commands/tag.rs at line 120 [45.74]

B:BD[45.2655] → [47.0:61]

∅:D[47.61] → [45.2764:2817]

B:BD[45.2764] → [45.2764:2817]

                let mut tag_path = repo.changes_dir.clone();
                std::fs::create_dir_all(&tag_path)?;

Replacement in pijul/src/commands/tag.rs at line 121 [45.74]

B:BD[45.2818] → [45.2818:2872]

B:BD[45.2872] → [47.62:101]

                let mut temp_path = tag_path.clone();
                temp_path.push("tmp");

[45.2818]

[45.2911]

                std::fs::create_dir_all(&repo.changes_dir)?;
                let temp_path = repo.changes_dir.join("tmp");

Replacement in pijul/src/commands/tag.rs at line 129 [45.74]

B:BD[48.212] → [48.212:301]

                libpijul::changestore::filesystem::push_tag_filename(&mut tag_path, &h);

[48.212]

[45.3230]

                let mut buf = PathBuf::new();
                let tag_path = fmt_filename(&mut buf, &repo.changes_dir, &h);

Replacement in pijul/src/commands/tag.rs at line 145 [45.74]

B:BD[49.689] → [47.150:211]

B:BD[47.211] → [48.380:562]

∅:D[47.263] → [45.3678:3700]

∅:D[50.312] → [45.3678:3700]

∅:D[48.562] → [45.3678:3700]

B:BD[45.3678] → [45.3678:3700]

∅:D[50.433] → [45.3700:3725]

B:BD[45.3700] → [45.3700:3725]

B:BD[45.3725] → [51.0:59]

                let mut tag_path = repo.changes_dir.clone();
                let h = if let Some(h) = libpijul::Merkle::from_base32(tag.as_bytes()) {
                    libpijul::changestore::filesystem::push_tag_filename(&mut tag_path, &h);
                    h
                } else {
                    super::find_hash(&mut tag_path, &tag)?

[49.689]

[45.3776]


                let h = match Merkle::from_base32(tag.as_bytes()) {
                    None => super::find_hash(&repo.changes_dir, &tag)?,
                    Some(v) => v,

Insertion in pijul/src/commands/tag.rs at line 150 [45.74]

[45.3795]

[50.486]


                let mut buf = PathBuf::new();
                let tag_path = fmt_filename(&mut buf, &repo.changes_dir, &h);

Replacement in pijul/src/commands/tag.rs at line 171 [45.74]

B:BD[52.5721] → [47.369:430]

B:BD[47.430] → [48.638:820]

∅:D[47.482] → [52.6006:6112]

∅:D[48.820] → [52.6006:6112]

B:BD[52.6006] → [52.6006:6112]

                let mut tag_path = repo.changes_dir.clone();
                let h = if let Some(h) = libpijul::Merkle::from_base32(tag.as_bytes()) {
                    libpijul::changestore::filesystem::push_tag_filename(&mut tag_path, &h);
                    h
                } else {
                    super::find_hash(&mut tag_path, &tag)?

[52.5721]

[52.6112]


                let h = match Merkle::from_base32(tag.as_bytes()) {
                    None => super::find_hash(&repo.changes_dir, &tag)?,
                    Some(v) => v,

Insertion in pijul/src/commands/tag.rs at line 177 [45.74]

[52.6132]

[47.483]

                let mut buf = PathBuf::new();
                let tag_path = fmt_filename(&mut buf, &repo.changes_dir, &h);

Replacement in pijul/src/commands/tag.rs at line 210 [45.74]

B:BD[6.882] → [6.882:1231]

                let mut tag_path = repo.changes_dir.clone();
                let h = if let Some(h) = libpijul::Merkle::from_base32(tag.as_bytes()) {
                    libpijul::changestore::filesystem::push_tag_filename(&mut tag_path, &h);
                    h
                } else {
                    super::find_hash(&mut tag_path, &tag)?

[6.882]

[6.1231]


                let h = match Merkle::from_base32(tag.as_bytes()) {
                    None => super::find_hash(&repo.changes_dir, &tag)?,
                    Some(v) => v,

Replacement in pijul/src/commands/tag.rs at line 250 [45.74]

B:BD[53.708] → [47.559:620]

                let mut tag_path = repo.changes_dir.clone();

[53.708]

[54.0]

                let mut buf = PathBuf::new();

Replacement in pijul/src/commands/tag.rs at line 255 [45.74]

∅:D[14.26959] → [48.936:1029]

B:BD[48.936] → [48.936:1029]

                    libpijul::changestore::filesystem::push_tag_filename(&mut tag_path, &m);

[14.26959]

[5.0]

                    let tag_path = fmt_filename(&mut buf, &repo.changes_dir, &m);

Deletion in pijul/src/commands/tag.rs at line 263 [45.74]

B:BD[53.1582] → [4.0:84]

                    libpijul::changestore::filesystem::pop_filename(&mut tag_path);

Replacement in pijul/src/commands/pushpull.rs at line 317 [8.111631]
B:BD[24.8905] → [24.8905:8947]
```
                repo.changes_dir.clone(),
```
[24.8905]
[24.8947]
```
                &repo.changes_dir,
```
Insertion in pijul/src/commands/protocol.rs at line 11 [8.123281]
[11.1961]
[26.15132]
```
use libpijul::changestore::filesystem::fmt_filename;
```
Replacement in pijul/src/commands/protocol.rs at line 56 [8.123281]
∅:D[55.1528] → [56.15774:15837]
B:BD[57.6860] → [56.15774:15837]
```
        let mut repo = Repository::find_root(self.repo_path)?;
```
[55.1528]
[7.3472]
```
        let repo = Repository::find_root(self.repo_path)?;
```
Insertion in pijul/src/commands/protocol.rs at line 62 [8.123281]
[8.125102]
[8.125102]
```
        let mut path_buf = PathBuf::new();
```

Replacement in pijul/src/commands/protocol.rs at line 179 [8.123281]

B:BD[58.137] → [14.34286:34448]

                    let mut tag_path = repo.changes_dir.clone();
                    libpijul::changestore::filesystem::push_tag_filename(&mut tag_path, &state);

[58.137]

[14.34448]

                    let tag_path = fmt_filename(&mut path_buf, &repo.changes_dir, &state);

Replacement in pijul/src/commands/protocol.rs at line 192 [8.123281]

B:BD[58.341] → [14.34919:35085]

                        let mut tag_path = repo.changes_dir.clone();
                        libpijul::changestore::filesystem::push_tag_filename(&mut tag_path, &m);

[58.341]

[14.35085]

                        let tag_path = fmt_filename(&mut path_buf, &repo.changes_dir, &state);

Replacement in pijul/src/commands/protocol.rs at line 236 [8.123281]

B:BD[8.128478] → [8.128478:128769]

                libpijul::changestore::filesystem::push_filename(&mut repo.changes_dir, &h);
                debug!("repo = {:?}", repo.changes_dir);
                let mut f = std::fs::File::open(&repo.changes_dir)?;
                let size = std::fs::metadata(&repo.changes_dir)?.len();

[8.128478]

[8.128769]


                let path = fmt_filename(&mut path_buf, &repo.changes_dir, &h);
                debug!("repo = {:?}", path);
                let mut f = std::fs::File::open(&path)?;
                let size = std::fs::metadata(&path)?.len();

Deletion in pijul/src/commands/protocol.rs at line 261 [8.123281]

B:BD[8.129500] → [8.129500:129588]

                libpijul::changestore::filesystem::pop_filename(&mut repo.changes_dir);

Replacement in pijul/src/commands/protocol.rs at line 268 [8.123281]

B:BD[8.129958] → [8.129958:130096]

                let mut path = repo.changes_dir.clone();
                libpijul::changestore::filesystem::push_filename(&mut path, &h);

[8.129958]

[59.0]

                let path = fmt_filename(&mut path_buf, &repo.changes_dir, &h);

Insertion in pijul/src/commands/mod.rs at line 2 [8.133619]
[56.19773]
[56.19773]
```
use std::path::Path;
```

Replacement in pijul/src/commands/mod.rs at line 286 [8.133619]

B:BD[51.69] → [48.1179:1297]

fn find_hash<B: libpijul::Base32>(
    path: &mut std::path::PathBuf,
    hash: &str,
) -> Result<B, anyhow::Error> {

[56.20228]

[51.194]

fn find_hash<B: libpijul::Base32>(base_dir: &Path, hash: &str) -> Result<B, anyhow::Error> {

Replacement in pijul/src/commands/mod.rs at line 291 [8.133619]
B:BD[51.321] → [51.321:339]
```
    path.push(a);
```
[51.321]
[51.339]
```
    let mut path = base_dir.join(a);
```

Replacement in pijul/src/commands/apply.rs at line 86 [8.194289]

B:BD[60.305] → [51.1149:1286]

                            let mut changes = repo.changes_dir.clone();
                            super::find_hash(&mut changes, &ch)?

[60.305]

[60.707]

                            super::find_hash(&repo.changes_dir, &ch)?

Insertion in libpijul/src/changestore/filesystem.rs at line 35 [8.824013]
[14.46709]
[8.824519]
```
}
pub trait CacheEntry {
    fn hash(&self) -> String;
    fn ext(&self) -> &str;
```

Replacement in libpijul/src/changestore/filesystem.rs at line 42 [8.824013]

B:BD[8.824522] → [8.824522:824742]

pub fn push_filename(changes_dir: &mut PathBuf, hash: &Hash) {
    let h32 = hash.to_base32();
    let (a, b) = h32.split_at(2);
    changes_dir.push(a);
    changes_dir.push(b);
    changes_dir.set_extension("change");

[8.824522]

[48.6585]

impl<T> CacheEntry for &T
where
    T: CacheEntry,
{
    fn hash(&self) -> String {
        (*self).hash()
    }
    fn ext(&self) -> &str {
        (*self).ext()
    }

Replacement in libpijul/src/changestore/filesystem.rs at line 55 [8.824013]

B:BD[48.6588] → [48.6588:6811]

pub fn push_tag_filename(changes_dir: &mut PathBuf, hash: &Merkle) {
    let h32 = hash.to_base32();
    let (a, b) = h32.split_at(2);
    changes_dir.push(a);
    changes_dir.push(b);
    changes_dir.set_extension("tag");

[48.6588]

[8.824742]

impl CacheEntry for Hash {
    fn hash(&self) -> String {
        self.to_base32()
    }
    fn ext(&self) -> &str {
        "change"
    }

Replacement in libpijul/src/changestore/filesystem.rs at line 65 [8.824013]

B:BD[8.824745] → [8.824745:824840]

pub fn pop_filename(changes_dir: &mut PathBuf) {
    changes_dir.pop();
    changes_dir.pop();

[8.824745]

[8.824840]

impl CacheEntry for Merkle {
    fn hash(&self) -> String {
        self.to_base32()
    }
    fn ext(&self) -> &str {
        "tag"
    }

Insertion in libpijul/src/changestore/filesystem.rs at line 75 [8.824013]

[8.824843]

pub fn fmt_filename<'a, T>(buf: &'a mut PathBuf, changes_dir: &Path, entry: &T) -> &'a Path
where
    T: CacheEntry,
{
    let hash = entry.hash();
    let (shard, rem) = hash.split_at(2);
    buf.clear();
    buf.push(changes_dir);
    buf.push(shard);
    buf.push(rem);
    buf.set_extension(entry.ext());
    buf
}

Replacement in libpijul/src/changestore/filesystem.rs at line 91 [8.824013]

B:BD[8.824861] → [8.824861:824914]

B:BD[8.824914] → [61.87778:87827]

∅:D[61.87827] → [8.824965:825005]

B:BD[8.824965] → [8.824965:825005]

    pub fn filename(&self, hash: &Hash) -> PathBuf {
        let mut path = self.changes_dir.clone();
        push_filename(&mut path, hash);

[8.824861]

[14.46710]

    pub fn filename<T>(&self, entry: &T) -> PathBuf
    where
        T: CacheEntry,
    {
        let mut path = PathBuf::new();
        self.fmt_filename(&mut path, entry);

Replacement in libpijul/src/changestore/filesystem.rs at line 100 [8.824013]

B:BD[14.46730] → [14.46730:46882]

∅:D[14.46882] → [8.825005:825018]

B:BD[8.825005] → [8.825005:825018]

    pub fn tag_filename(&self, hash: &Merkle) -> PathBuf {
        let mut path = self.changes_dir.clone();
        push_tag_filename(&mut path, hash);
        path

[14.46730]

[8.825018]

    pub fn fmt_filename<'a, T>(&self, buf: &'a mut PathBuf, entry: &T) -> &'a Path
    where
        T: CacheEntry,
    {
        fmt_filename(buf, &self.changes_dir, entry)

Replacement in libpijul/src/changestore/filesystem.rs at line 203 [8.824013]
B:BD[14.46963] → [14.46963:47004]
```
        let path = self.tag_filename(h);
```
[14.46963]
[14.47004]
```
        let path = self.filename(h);
```

Clean up change file name handling

Dependencies

In channels

Change contents

Replacement in pijul-remote/src/ssh.rs at line 4 [8.25380]

Insertion in pijul-remote/src/ssh.rs at line 12 [8.25380]

Replacement in pijul-remote/src/ssh.rs at line 343 [8.25380]

Replacement in pijul-remote/src/ssh.rs at line 524 [8.25380]

Insertion in pijul-remote/src/ssh.rs at line 528 [8.25380]

Replacement in pijul-remote/src/ssh.rs at line 549 [8.25380]

Replacement in pijul-remote/src/ssh.rs at line 556 [8.25380]

Replacement in pijul-remote/src/ssh.rs at line 583 [8.25380]

Replacement in pijul-remote/src/ssh.rs at line 934 [8.25380]

Insertion in pijul-remote/src/ssh.rs at line 938 [8.25380]

Replacement in pijul-remote/src/ssh.rs at line 950 [8.25380]

Deletion in pijul-remote/src/ssh.rs at line 963 [8.25380]

Replacement in pijul-remote/src/ssh.rs at line 965 [8.25380]

Deletion in pijul-remote/src/ssh.rs at line 976 [8.25380]

Replacement in pijul-remote/src/ssh.rs at line 988 [8.25380]

Replacement in pijul-remote/src/ssh.rs at line 1000 [8.25380]

Replacement in pijul-remote/src/ssh.rs at line 1004 [8.25380]

Replacement in pijul-remote/src/ssh.rs at line 1006 [8.25380]

Replacement in pijul-remote/src/ssh.rs at line 1010 [8.25380]

Replacement in pijul-remote/src/local.rs at line 2 [8.79745]

Insertion in pijul-remote/src/local.rs at line 6 [8.79745]

Replacement in pijul-remote/src/local.rs at line 212 [8.79745]

Replacement in pijul-remote/src/local.rs at line 214 [8.79745]