kenranunderscore/pijul - Change 7MFC7MVAFNDP4ANWQN25ASBGT4DLLRJ3GKAT4DS56EBKSMUDSDEQC

Refactor protocol command's handling of repo and channel

Created by dblsaiko on March 29, 2024

7MFC7MVAFNDP4ANWQN25ASBGT4DLLRJ3GKAT4DS56EBKSMUDSDEQC

Dependencies

In channels

main

Change contents

Insertion in pijul/src/commands/protocol.rs at line 7 [5.123281]

[3.1914]

[4.15113]

use crate::commands::common_opts::RepoPath;
use crate::commands::load_channel_exact;

Replacement in pijul/src/commands/protocol.rs at line 22 [5.123281]

B:BD[5.123656] → [6.1117:1267]

∅:D[6.1267] → [5.123656:123721]

∅:D[7.1965] → [5.123656:123721]

∅:D[8.2698] → [5.123656:123721]

B:BD[5.123656] → [5.123656:123721]

    /// 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")]
    repo_path: Option<PathBuf>,

[5.123656]

[8.2699]

    #[clap(flatten)]
    base: RepoPath,

Deletion in pijul/src/commands/protocol.rs at line 44 [5.123281]
B:BD[5.124435] → [4.15150:15291]
∅:D[4.15291] → [5.124564:124591]
B:BD[5.124564] → [5.124564:124591]
B:BD[5.124591] → [4.15292:15337]
∅:D[4.15337] → [5.124694:124703]
B:BD[5.124694] → [5.124694:124703]
```
fn load_channel<T: MutTxnTExt>(txn: &T, name: &str) -> Result<ChannelRef<T>, anyhow::Error> {
    if let Some(c) = txn.load_channel(name)? {
        Ok(c)
    } else {
        bail!("No such channel: {:?}", name)
    }
}
```

Replacement in pijul/src/commands/protocol.rs at line 48 [5.123281]

B:BD[9.1528] → [2.1857:1931]

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

[9.1528]

[10.3472]

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

Replacement in pijul/src/commands/protocol.rs at line 64 [5.123281]

B:BD[11.15889] → [12.11419:11487]

                let channel = load_channel(&*txn.read(), &cap[1])?;

[11.15889]

[12.11487]

                let channel = load_channel_exact(&cap[1], &*txn.read())?;

Replacement in pijul/src/commands/protocol.rs at line 69 [5.123281]

B:BD[11.16129] → [12.11528:11596]

                let channel = load_channel(&*txn.read(), &cap[1])?;

[11.16129]

[5.125525]

                let channel = load_channel_exact(&cap[1], &*txn.read())?;

Replacement in pijul/src/commands/protocol.rs at line 120 [5.123281]

B:BD[5.126588] → [12.11766:11834]

                let channel = load_channel(&*txn.read(), &cap[1])?;

[5.126588]

[5.126648]

                let channel = load_channel_exact(&cap[1], &*txn.read())?;

Replacement in pijul/src/commands/protocol.rs at line 181 [5.123281]

∅:D[13.34918] → [14.137:209]

B:BD[14.137] → [14.137:209]

                    let channel = load_channel(&*txn.read(), &cap[2])?;

[13.34918]

[14.209]

                    let channel = load_channel_exact(&cap[2], &*txn.read())?;

Replacement in pijul/src/commands/protocol.rs at line 267 [5.123281]

B:BD[5.130373] → [12.12035:12103]

                let channel = load_channel(&*txn.read(), &cap[1])?;

[5.130373]

[15.626]

                let channel = load_channel_exact(&cap[1], &*txn.read())?;

Replacement in pijul/src/commands/protocol.rs at line 281 [5.123281]

B:BD[5.131201] → [12.12279:12347]

                let channel = load_channel(&*txn.read(), &cap[1])?;

[5.131201]

[5.131261]

                let channel = load_channel_exact(&cap[1], &*txn.read())?;