pijul/pijul - Change YMCFR3BMW6OIR67YH5I7KFOFGA7PAKPLQFBXQJOYZ5N37NLSF3WAC

Refactor debug command's handling of repo and channel

Created by dblsaiko on March 30, 2024

YMCFR3BMW6OIR67YH5I7KFOFGA7PAKPLQFBXQJOYZ5N37NLSF3WAC

Dependencies

In discussions

#918 Refactor repository and channel handling in CLI commands

Change contents

Replacement in pijul/src/commands/debug.rs at line 1 [6.177758]
B:BD[6.177758] → [7.2712:2737]
B:BD[6.177794] → [8.17710:17728]
B:BD[8.17728] → [4.2079:2110]
∅:D[9.1386] → [10.0:31]
∅:D[4.2110] → [10.0:31]
B:BD[11.16] → [10.0:31]
```
use std::path::PathBuf;
use anyhow::bail;
use clap::{Parser, ValueHint};
use libpijul::{TxnT, TxnTExt};
```
[6.177758]
[2.0]
```
use crate::commands::common_opts::RepoAndChannel;
use crate::commands::load_channel;
use clap::Parser;
use libpijul::TxnTExt;
```
Replacement in pijul/src/commands/debug.rs at line 10 [6.177758]
B:BD[6.177879] → [4.2111:2177]
∅:D[4.2177] → [6.177912:177944]
B:BD[6.177912] → [6.177912:177944]
∅:D[12.4302] → [6.177944:178003]
B:BD[6.177944] → [6.177944:178003]
```
    #[clap(long = "repository", value_hint = ValueHint::DirPath)]
    repo_path: Option<PathBuf>,
    #[clap(long = "channel")]
    channel: Option<String>,
```
[6.177879]
[13.21028]
```
    #[clap(flatten)]
    base: RepoAndChannel,
```

Replacement in pijul/src/commands/debug.rs at line 19 [6.177758]

B:BD[14.2252] → [5.2396:2466]

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

[14.2252]

[6.178130]

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

Replacement in pijul/src/commands/debug.rs at line 21 [6.177758]

B:BD[6.178176] → [15.3312:3406]

B:BD[15.3406] → [3.1054:1125]

∅:D[3.1125] → [15.3474:3506]

B:BD[15.3474] → [15.3474:3506]

∅:D[16.977] → [8.17729:17809]

∅:D[17.2540] → [8.17729:17809]

∅:D[15.3506] → [8.17729:17809]

B:BD[6.178297] → [8.17729:17809]

∅:D[8.17809] → [6.178376:178413]

B:BD[6.178376] → [6.178376:178413]

B:BD[6.178413] → [8.17810:17867]

∅:D[8.17867] → [6.178548:178559]

B:BD[6.178548] → [6.178548:178559]

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

[6.178176]

[13.21092]

        let (channel, _) = load_channel(self.base.channel(), &txn)?;