dblsaiko/pijul - Change DDEUZMXQRYVBGTJWKZY6W4UFSDCLB6JV7VX32AOTY3ZPD7OS6P6QC

Refactor record command's handling of repo and channel

Created by dblsaiko on March 29, 2024

DDEUZMXQRYVBGTJWKZY6W4UFSDCLB6JV7VX32AOTY3ZPD7OS6P6QC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/commands/record.rs at line 8 [5.101759]
B:BD[5.101821] → [3.628:659]
```
use clap::{Parser, ValueHint};
```
[5.101821]
[5.101821]
```
use clap::Parser;
```

Insertion in pijul/src/commands/record.rs at line 17 [5.101759]

[5.102093]

[6.1027]

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

Insertion in pijul/src/commands/record.rs at line 23 [5.101759]
[5.102136]
[7.849]
```
    #[clap(flatten)]
    base: RepoAndChannel,
```

Deletion in pijul/src/commands/record.rs at line 37 [5.101759]

B:BD[5.102331] → [7.983:1056]

∅:D[7.1056] → [5.102331:102394]

B:BD[5.102331] → [5.102331:102394]

B:BD[5.102394] → [8.664:814]

B:BD[8.814] → [3.660:726]

∅:D[3.726] → [5.102427:102463]

B:BD[5.102427] → [5.102427:102463]

    /// Record the change in this channel instead of the current channel
    #[clap(long = "channel")]
    pub channel: Option<String>,
    /// 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)]
    pub repo_path: Option<PathBuf>,

Replacement in pijul/src/commands/record.rs at line 71 [5.101759]

B:BD[9.536] → [4.1569:1639]

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

[9.536]

[5.102903]

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

Deletion in pijul/src/commands/record.rs at line 79 [5.101759]

B:BD[10.5158] → [10.5158:5231]

B:BD[10.5231] → [2.430:480]

∅:D[2.480] → [10.5278:5304]

B:BD[10.5278] → [10.5278:5304]

∅:D[10.5304] → [11.1549:1638]

B:BD[12.283] → [11.1549:1638]

B:BD[11.1638] → [10.5305:5330]

∅:D[10.5330] → [11.1706:1717]

B:BD[11.1706] → [11.1706:1717]

B:BD[11.1717] → [10.5331:5417]

∅:D[10.5417] → [13.160:262]

B:BD[13.160] → [13.160:262]

        let cur = txn
            .read()
            .current_channel()
            .unwrap_or(libpijul::DEFAULT_CHANNEL)
            .to_string();
        let channel = if let Some(ref c) = self.channel {
            c
        } else {
            cur.as_str()
        };
        let mut channel = if let Some(channel) = txn.read().load_channel(&channel)? {
            channel
        } else {
            bail!("Channel {:?} not found", channel);
        };

Replacement in pijul/src/commands/record.rs at line 80 [5.101759]

B:BD[14.194] → [14.194:287]

B:BD[14.287] → [10.5418:5476]

∅:D[10.5476] → [14.338:357]

B:BD[14.338] → [14.338:357]

B:BD[14.357] → [10.5477:5575]

∅:D[10.5575] → [14.424:590]

∅:D[15.10133] → [14.424:590]

∅:D[16.12800] → [14.424:590]

B:BD[14.424] → [14.424:590]

B:BD[14.590] → [10.5576:5616]

∅:D[10.5616] → [14.632:650]

∅:D[16.12850] → [14.632:650]

B:BD[14.632] → [14.632:650]

        let mut extra = Vec::new();
        for h in repo.config.extra_dependencies.iter() {
            let (h, c) = txn.read().hash_from_prefix(h)?;
            if txn
                .read()
                .get_changeset(txn.read().changes(&*channel.read()), &c)?
                .is_none()
            {
                bail!(
                    "Change {:?} (from .pijul/config) is not on channel {:?}",
                    h,
                    channel.read().name
                )

[14.194]

[14.650]

        let (mut channel, extra) = {
            let txn = txn.read();
            let (channel, _) = load_channel(self.base.channel(), &*txn)?;
            let mut extra = Vec::new();
            for h in repo.config.extra_dependencies.iter() {
                let (h, c) = txn.hash_from_prefix(h)?;
                if txn
                    .get_changeset(txn.changes(&*channel.read()), &c)?
                    .is_none()
                {
                    bail!(
                        "Change {:?} (from .pijul/config) is not on channel {:?}",
                        h,
                        channel.read().name
                    )
                }
                extra.push(h)

Replacement in pijul/src/commands/record.rs at line 100 [5.101759]

B:BD[14.664] → [14.664:700]

            extra.push(h)
        }

[14.664]

[5.103751]


            (channel, extra)
        };

Replacement in pijul/src/commands/record.rs at line 105 [5.101759]

B:BD[5.103811] → [17.76:128]

B:BD[17.128] → [10.5617:5763]

∅:D[10.5763] → [15.10134:10166]

∅:D[16.12938] → [15.10134:10166]

B:BD[18.12559] → [15.10134:10166]

∅:D[15.10166] → [17.288:340]

∅:D[18.12584] → [17.288:340]

B:BD[17.288] → [17.288:340]

            let h = if let Some(ref hash) = amend {
                txn.read().hash_from_prefix(hash)?.0
            } else if let Some(h) = txn.read().reverse_log(&*channel.read(), None)?.next() {
                (h?.1).0.into()
            } else {
                return Ok(());

[5.103811]

[17.340]

            let h = {
                let txn = txn.read();
                if let Some(ref hash) = amend {
                    txn.hash_from_prefix(hash)?.0
                } else if let Some(h) = txn.reverse_log(&*channel.read(), None)?.next() {
                    h?.1 .0.into()
                } else {
                    return Ok(());
                }