pijul/pijul - Change 4PX6WLAFTZZY6O57NEAPWZG25NR2TZ4KESKPRMS3G3QVKL7L6LNQC

Refactor archive command's handling of repo and channel

Created by dblsaiko on March 30, 2024

4PX6WLAFTZZY6O57NEAPWZG25NR2TZ4KESKPRMS3G3QVKL7L6LNQC

Dependencies

In discussions

#918 Refactor repository and channel handling in CLI commands

Change contents

Deletion in pijul/src/commands/archive.rs at line 1 [5.191083]
B:BD[5.191222] → [5.191222:191246]
B:BD[5.191246] → [6.3152:3153]
```
use std::path::PathBuf;
```
Replacement in pijul/src/commands/archive.rs at line 3 [5.191083]
∅:D[3.2746] → [7.1796:1832]
B:BD[8.1637] → [7.1796:1832]
```
use libpijul::{Hash, Merkle, TxnT};
```
[3.2746]
[6.3252]
```
use libpijul::{Hash, Merkle};
```

Insertion in pijul/src/commands/archive.rs at line 6 [5.191083]

[5.191247]

[9.2089]

use crate::commands::common_opts::RepoAndChannel;
use crate::commands::load_channel;

Replacement in pijul/src/commands/archive.rs at line 12 [5.191083]

B:BD[5.191291] → [10.3705:3855]

B:BD[10.3855] → [3.2747:2813]

∅:D[3.2813] → [5.191324:191356]

B:BD[5.191324] → [5.191324:191356]

B:BD[5.191356] → [11.3700:3757]

∅:D[11.3757] → [5.191356:191415]

∅:D[12.5537] → [5.191356:191415]

B:BD[5.191356] → [5.191356:191415]

    /// Set the repository where this command should run. Defaults to the first ancestor of the current directory that contains a `.pijul` directory.
    #[clap(long = "repository", value_hint = ValueHint::DirPath)]
    repo_path: Option<PathBuf>,
    /// Use this channel, instead of the current channel
    #[clap(long = "channel")]
    channel: Option<String>,

[5.191291]

[11.3758]

    #[clap(flatten)]
    base: RepoAndChannel,

Insertion in pijul/src/commands/archive.rs at line 70 [5.191083]

[5.192144]


        let mut actual_repo = self.base.repo_path().map(|v| v.to_path_buf());

Replacement in pijul/src/commands/archive.rs at line 79 [5.191083]

B:BD[5.192302] → [5.192302:192413]

B:BD[5.192413] → [13.1364:1410]

∅:D[13.1410] → [5.192456:192475]

B:BD[5.192456] → [5.192456:192475]

                if let Some(ref channel) = self.channel {
                    channel
                } else {
                    libpijul::DEFAULT_CHANNEL
                },

[5.192302]

[5.192475]

                self.base.channel().unwrap_or(libpijul::DEFAULT_CHANNEL),

Replacement in pijul/src/commands/archive.rs at line 85 [5.191083]

∅:D[2.854] → [14.8391:8522]

B:BD[14.8391] → [14.8391:8522]

                if let Some(ref mut path) = self.repo_path {
                    path.clear();
                    path.push(rem);

[2.854]

[14.8522]

                if self.base.repo_path().is_some() {
                    actual_repo = Some(rem.into());

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

B:BD[14.8987] → [4.3013:3090]

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

[14.8987]

[5.193066]

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

Insertion in pijul/src/commands/archive.rs at line 107 [5.191083]

[15.851]

[5.193379]


            let txn = repo.pristine.arc_txn_begin()?;
            let (channel, _) = load_channel(self.base.channel(), &*txn.read())?;

Deletion in pijul/src/commands/archive.rs at line 113 [5.191083]

B:BD[5.193436] → [7.1833:2095]

B:BD[7.2095] → [13.1411:1494]

∅:D[13.1494] → [7.2175:2260]

B:BD[7.2175] → [7.2175:2260]

∅:D[7.2260] → [16.4586:4605]

B:BD[16.4586] → [16.4586:4605]

                let txn = repo.pristine.arc_txn_begin()?;
                let channel = {
                    let txn = txn.read();
                    let channel_name = if let Some(ref c) = self.channel {
                        c
                    } else {
                        txn.current_channel().unwrap_or(libpijul::DEFAULT_CHANNEL)
                    };
                    txn.load_channel(&channel_name)?.unwrap()
                };

Deletion in pijul/src/commands/archive.rs at line 122 [5.191083]

B:BD[5.193815] → [7.2292:2554]

B:BD[7.2554] → [13.1495:1578]

∅:D[13.1578] → [7.2634:2888]

B:BD[7.2634] → [7.2634:2888]

∅:D[7.2888] → [16.4800:4819]

B:BD[16.4800] → [16.4800:4819]

                let txn = repo.pristine.arc_txn_begin()?;
                let channel = {
                    let txn = txn.read();
                    let channel_name = if let Some(ref c) = self.channel {
                        c
                    } else {
                        txn.current_channel().unwrap_or(libpijul::DEFAULT_CHANNEL)
                    };
                    if let Some(channel) = txn.load_channel(&channel_name)? {
                        channel
                    } else {
                        bail!("No such channel: {:?}", channel_name);
                    }
                };

Insertion in pijul/src/commands/archive.rs at line 124 [5.191083]
[5.194024]
[17.3077]