dblsaiko/pijul - Change Q7LEDPIWGV5LJE3LYXLT74RBKOHEHLL4EJY6N4FDR3B6ZPX3V2UAC

Refactor tag command's handling of repo and channel

Created by dblsaiko on March 30, 2024

Q7LEDPIWGV5LJE3LYXLT74RBKOHEHLL4EJY6N4FDR3B6ZPX3V2UAC

Dependencies

In channels

main

Change contents

Insertion in pijul/src/commands/tag.rs at line 3 [5.74]

[5.150]

[6.0]

use crate::commands::common_opts::RepoPath;
use crate::commands::load_channel;

Replacement in pijul/src/commands/tag.rs at line 7 [5.74]
B:BD[5.203] → [3.99:130]
```
use clap::{Parser, ValueHint};
```
[5.203]
[5.219]
```
use clap::Parser;
```

Replacement in pijul/src/commands/tag.rs at line 9 [5.74]

B:BD[5.255] → [7.2342:2427]

use libpijul::{ArcTxn, Base32, ChannelMutTxnT, ChannelTxnT, MutTxnT, TxnT, TxnTExt};

[5.255]

[8.0]

use libpijul::{ArcTxn, Base32, ChannelMutTxnT, ChannelRef, ChannelTxnT, MutTxnT, TxnT, TxnTExt};

Insertion in pijul/src/commands/tag.rs at line 15 [5.74]
[5.373]
[5.604]
```
    #[clap(flatten)]
    base: RepoPath,
```
Deletion in pijul/src/commands/tag.rs at line 19 [5.74]
B:BD[9.32] → [3.131:197]
∅:D[3.197] → [10.26452:26484]
B:BD[10.26452] → [10.26452:26484]
```
    #[clap(long = "repository", value_hint = ValueHint::DirPath)]
    repo_path: Option<PathBuf>,
```

Replacement in pijul/src/commands/tag.rs at line 29 [5.74]

B:BD[5.764] → [11.0:178]

B:BD[11.178] → [3.198:268]

∅:D[3.268] → [11.215:251]

B:BD[11.215] → [11.215:251]

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

[5.764]

        #[clap(flatten)]
        base: RepoPath,

Replacement in pijul/src/commands/tag.rs at line 46 [5.74]

B:BD[5.1249] → [11.252:430]

B:BD[11.430] → [3.269:339]

∅:D[3.339] → [11.467:503]

B:BD[11.467] → [11.467:503]

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

[5.1249]

        #[clap(flatten)]
        base: RepoPath,

Replacement in pijul/src/commands/tag.rs at line 57 [5.74]

B:BD[12.5312] → [13.95:273]

B:BD[13.273] → [3.340:410]

∅:D[3.410] → [13.310:346]

B:BD[13.310] → [13.310:346]

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

[12.5312]

[13.346]

        #[clap(flatten)]
        base: RepoPath,

Replacement in pijul/src/commands/tag.rs at line 65 [5.74]

∅:D[13.532] → [12.5312:5490]

B:BD[12.5312] → [12.5312:5490]

B:BD[12.5490] → [3.411:481]

∅:D[3.481] → [12.5527:5563]

B:BD[12.5527] → [12.5527:5563]

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

[13.532]

[13.533]

        #[clap(flatten)]
        base: RepoPath,

Replacement in pijul/src/commands/tag.rs at line 79 [5.74]
B:BD[9.71] → [11.504:531]
```
                repo_path,
```
[9.71]
[5.1712]
```
                base,
```

Replacement in pijul/src/commands/tag.rs at line 85 [5.74]

B:BD[9.92] → [4.1119:1196]

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

[9.92]

[7.2428]

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

Replacement in pijul/src/commands/tag.rs at line 87 [5.74]

∅:D[7.2486] → [8.71:133]

B:BD[8.71] → [8.71:133]

∅:D[8.133] → [14.459:506]

B:BD[14.459] → [14.459:506]

B:BD[14.506] → [7.2487:2561]

B:BD[7.2561] → [2.139:201]

∅:D[2.201] → [8.235:272]

B:BD[8.235] → [8.235:272]

∅:D[8.272] → [14.582:601]

B:BD[14.582] → [14.582:601]

B:BD[14.601] → [8.273:334]

B:BD[8.388] → [8.388:456]

B:BD[8.456] → [7.2562:2761]

                let channel_name = if let Some(c) = channel {
                    c
                } else {
                    txn.read()
                        .current_channel()
                        .unwrap_or(libpijul::DEFAULT_CHANNEL)
                        .to_string()
                };
                debug!("channel_name = {:?}", channel_name);
                try_record(&mut repo, txn.clone(), &channel_name)?;
                let channel = txn.read().load_channel(&channel_name)?.unwrap();
                let last_t = if let Some(n) = txn.read().reverse_log(&*channel.read(), None)?.next()
                {

[7.2486]

[5.2305]

                let (channel, _) = load_channel(channel.as_deref(), &*txn.read())?;
                debug!("channel_name = {:?}", channel.read().name);
                try_record(&mut repo, txn.clone(), channel.clone())?;
                let last_t = {
                    let txn = txn.read();
                    let Some(n) = txn.reverse_log(&*channel.read(), None)?.next() else {
                        bail!("Channel {} is empty", channel.read().name.as_str());
                    };

Deletion in pijul/src/commands/tag.rs at line 97 [5.74]

B:BD[5.2337] → [5.2337:2426]

                } else {
                    bail!("Channel {} is empty", channel_name);

Insertion in pijul/src/commands/tag.rs at line 98 [5.74]
[5.2445]
[5.2445]

Replacement in pijul/src/commands/tag.rs at line 111 [5.74]

∅:D[15.142] → [16.74:212]

B:BD[5.3053] → [16.74:212]

                let h: libpijul::Merkle =
                    libpijul::tag::from_channel(&*txn.read(), &channel_name, &header, &mut w)?;

[15.142]

[16.212]

                let h: libpijul::Merkle = libpijul::tag::from_channel(
                    &*txn.read(),
                    channel.read().name.as_str(),
                    &header,
                    &mut w,
                )?;

Replacement in pijul/src/commands/tag.rs at line 127 [5.74]
B:BD[17.40] → [11.599:626]
```
                repo_path,
```
[17.40]
[17.40]
```
                base,
```

Replacement in pijul/src/commands/tag.rs at line 131 [5.74]

B:BD[17.113] → [4.1197:1270]

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

[17.113]

[18.150]

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

Replacement in pijul/src/commands/tag.rs at line 142 [5.74]

∅:D[17.586] → [5.3795:3984]

B:BD[5.3795] → [5.3795:3984]

                let channel_name = if let Some(ref channel) = to_channel {
                    channel.as_str()
                } else {
                    tag.as_str()
                };

[17.586]

[5.4046]

                let channel_name = to_channel.as_deref().unwrap_or(&tag);

Replacement in pijul/src/commands/tag.rs at line 151 [5.74]

B:BD[12.5599] → [12.5599:5659]

B:BD[12.5659] → [4.1271:1344]

            Some(SubCommand::Reset { repo_path, tag }) => {
                let repo = Repository::find_root(repo_path.as_deref())?;

[12.5599]

[18.369]

            Some(SubCommand::Reset { base, tag }) => {
                let repo = Repository::find_root(base.repo_path())?;

Replacement in pijul/src/commands/tag.rs at line 185 [5.74]

B:BD[13.689] → [13.689:820]

B:BD[13.820] → [4.1345:1418]

            Some(SubCommand::Delete {
                repo_path,
                channel,
                tag,
            }) => {
                let repo = Repository::find_root(repo_path.as_deref())?;

[13.689]

[13.882]

            Some(SubCommand::Delete { base, channel, tag }) => {
                let repo = Repository::find_root(base.repo_path())?;

Replacement in pijul/src/commands/tag.rs at line 196 [5.74]

B:BD[13.1313] → [13.1313:1418]

B:BD[13.1418] → [2.202:264]

∅:D[2.264] → [13.1477:1748]

B:BD[13.1477] → [13.1477:1748]

                let channel_name = channel.unwrap_or_else(|| {
                    txn.current_channel()
                        .unwrap_or(libpijul::DEFAULT_CHANNEL)
                        .to_string()
                });
                let channel = if let Some(c) = txn.load_channel(&channel_name)? {
                    c
                } else {
                    bail!("Channel {:?} not found", channel_name)
                };

[13.1313]

[13.1748]

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

Replacement in pijul/src/commands/tag.rs at line 209 [5.74]

B:BD[9.268] → [4.1419:1497]

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

[9.268]

[9.440]

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

Replacement in pijul/src/commands/tag.rs at line 211 [5.74]

B:BD[9.494] → [10.26612:26722]

B:BD[10.26722] → [2.265:327]

∅:D[2.327] → [10.26781:26838]

B:BD[10.26781] → [10.26781:26838]

∅:D[14.769] → [9.494:708]

∅:D[10.26838] → [9.494:708]

B:BD[9.494] → [9.494:708]

                let channel_name = self.channel.unwrap_or_else(|| {
                    txn.current_channel()
                        .unwrap_or(libpijul::DEFAULT_CHANNEL)
                        .to_string()
                });
                let channel = if let Some(c) = txn.load_channel(&channel_name)? {
                    c
                } else {
                    bail!("Channel {:?} not found", channel_name)
                };

[9.494]

[18.559]

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

Replacement in pijul/src/commands/tag.rs at line 277 [5.74]
∅:D[7.3230] → [8.769:788]
B:BD[8.769] → [8.769:788]
```
    channel: &str,
```
[7.3230]
[8.788]
```
    channel: ChannelRef<T>,
```
Deletion in pijul/src/commands/tag.rs at line 279 [5.74]
B:BD[8.821] → [7.3231:3308]
∅:D[7.3308] → [8.907:923]
B:BD[8.907] → [8.907:923]
∅:D[8.923] → [5.6281:6342]
B:BD[5.6281] → [5.6281:6342]
B:BD[5.6342] → [8.924:931]
```
    let channel = if let Some(channel) = txn.read().load_channel(channel)? {
        channel
    } else {
        bail!("Channel not found: {}", channel)
    };
```
Deletion in pijul/src/commands/tag.rs at line 297 [5.74]
B:BD[5.95] → [5.95:119]
```
use std::path::PathBuf;
```
Solving an order conflict in pijul/src/commands/tag.rs at line 297 [5.74]
[17.1459]

Refactor tag command's handling of repo and channel

Dependencies

In channels

Change contents

Insertion in pijul/src/commands/tag.rs at line 3 [5.74]

Replacement in pijul/src/commands/tag.rs at line 7 [5.74]

Replacement in pijul/src/commands/tag.rs at line 9 [5.74]

Insertion in pijul/src/commands/tag.rs at line 15 [5.74]

Deletion in pijul/src/commands/tag.rs at line 19 [5.74]

Replacement in pijul/src/commands/tag.rs at line 29 [5.74]

Replacement in pijul/src/commands/tag.rs at line 46 [5.74]

Replacement in pijul/src/commands/tag.rs at line 57 [5.74]

Replacement in pijul/src/commands/tag.rs at line 65 [5.74]

Replacement in pijul/src/commands/tag.rs at line 79 [5.74]

Replacement in pijul/src/commands/tag.rs at line 85 [5.74]

Replacement in pijul/src/commands/tag.rs at line 87 [5.74]

Deletion in pijul/src/commands/tag.rs at line 97 [5.74]

Insertion in pijul/src/commands/tag.rs at line 98 [5.74]

Replacement in pijul/src/commands/tag.rs at line 111 [5.74]

Replacement in pijul/src/commands/tag.rs at line 127 [5.74]

Replacement in pijul/src/commands/tag.rs at line 131 [5.74]

Replacement in pijul/src/commands/tag.rs at line 142 [5.74]

Replacement in pijul/src/commands/tag.rs at line 151 [5.74]

Replacement in pijul/src/commands/tag.rs at line 185 [5.74]

Replacement in pijul/src/commands/tag.rs at line 196 [5.74]

Replacement in pijul/src/commands/tag.rs at line 209 [5.74]

Replacement in pijul/src/commands/tag.rs at line 211 [5.74]

Replacement in pijul/src/commands/tag.rs at line 277 [5.74]

Deletion in pijul/src/commands/tag.rs at line 279 [5.74]

Deletion in pijul/src/commands/tag.rs at line 297 [5.74]

Solving an order conflict in pijul/src/commands/tag.rs at line 297 [5.74]