dblsaiko/pijul - Change JA4POQALQZSM4U6XII4VE56J3LNM57MCFMAKFKYJCBNY6OCYRZ7AC

Refactor channel command's handling of repo and channel

Created by dblsaiko on March 29, 2024

JA4POQALQZSM4U6XII4VE56J3LNM57MCFMAKFKYJCBNY6OCYRZ7AC

Dependencies

In channels

main

Change contents

Deletion in pijul/src/commands/channel.rs at line 2 [4.186892]
B:BD[4.186989] → [4.186989:187013]
```
use std::path::PathBuf;
```

Insertion in pijul/src/commands/channel.rs at line 3 [4.186892]

[4.187014]

[5.0]

use crate::commands::common_opts::RepoPath;
use crate::commands::{load_channel, load_channel_exact};

Replacement in pijul/src/commands/channel.rs at line 7 [4.186892]
B:BD[6.18687] → [2.2496:2527]
```
use clap::{Parser, ValueHint};
```
[6.18687]
[7.943]
```
use clap::Parser;
```

Replacement in pijul/src/commands/channel.rs at line 14 [4.186892]

B:BD[4.187058] → [8.3554:3704]

B:BD[8.3704] → [2.2528:2594]

∅:D[2.2594] → [4.187091:187123]

B:BD[4.187091] → [4.187091:187123]

    /// 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>,

[4.187058]

[4.187123]

    #[clap(flatten)]
    base: RepoPath,

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

B:BD[4.187735] → [3.2626:2704]

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

[4.187735]

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

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

B:BD[4.188244] → [3.2705:2783]

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

[4.188244]

[9.3917]

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

Replacement in pijul/src/commands/channel.rs at line 74 [4.186892]

B:BD[5.69] → [5.69:142]

                    return Err(anyhow!("Channel {} not found", delete));

[5.69]

[5.142]

                    return Err(anyhow!("No such channel: {}", delete));

Replacement in pijul/src/commands/channel.rs at line 80 [4.186892]

B:BD[10.1508] → [10.1508:1555]

                    repo_path: self.repo_path,

[10.1508]

[10.1555]

                    base: self.base,

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

B:BD[4.188456] → [3.2784:2862]

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

[4.188456]

[11.960]

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

Replacement in pijul/src/commands/channel.rs at line 99 [4.186892]

B:BD[4.188838] → [6.18898:18981]

∅:D[6.18981] → [4.188920:188973]

B:BD[4.188920] → [4.188920:188973]

B:BD[4.188973] → [6.18982:19039]

∅:D[6.19039] → [4.189141:189160]

B:BD[4.189141] → [4.189141:189160]

                let mut channel = if let Some(channel) = txn.load_channel(from)? {
                    channel
                } else {
                    bail!("No such channel: {:?}", from)
                };

[4.188838]

[4.189160]


                let mut channel = load_channel_exact(from, &txn)?;

Replacement in pijul/src/commands/channel.rs at line 110 [4.186892]

B:BD[12.391] → [3.2863:2941]

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

[12.391]

[13.228]

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

Replacement in pijul/src/commands/channel.rs at line 118 [4.186892]

B:BD[12.570] → [12.570:862]

                    let current = txn.current_channel()?;
                    let channel = if let Some(channel) = txn.load_channel(current)? {
                        channel
                    } else {
                        bail!("No such channel: {:?}", current)
                    };

[12.570]

[12.862]

                    let (channel, _) = load_channel(None, &txn)?;