dblsaiko/pijul - Change OSWFAKWMXL7N3ZHL74TKXEUDGSBDUHBNFAPI25LUB6RBTQKFC6EQC

Refactor push/pull commands' handling of repo and channel

Created by dblsaiko on March 30, 2024

OSWFAKWMXL7N3ZHL74TKXEUDGSBDUHBNFAPI25LUB6RBTQKFC6EQC

Dependencies

In channels

main

Change contents

Deletion in pijul/src/commands/pushpull.rs at line 3 [7.111631]
B:BD[6.1671] → [6.1671:1695]
```
use std::path::PathBuf;
```
Replacement in pijul/src/commands/pushpull.rs at line 4 [7.111631]
B:BD[6.1696] → [8.2921:2969]
```
use super::{make_changelist, parse_changelist};
```
[6.1696]
[9.6849]
```
use super::{get_channel, make_changelist, parse_changelist};
```
Insertion in pijul/src/commands/pushpull.rs at line 14 [7.111631]
[6.1761]
[3.453]
```
use crate::commands::common_opts::RepoPath;
```
Insertion in pijul/src/commands/pushpull.rs at line 21 [7.111631]
[7.111922]
[7.111922]
```
    #[clap(flatten)]
    base: RepoPath,
```

Deletion in pijul/src/commands/pushpull.rs at line 25 [7.111631]

B:BD[7.111977] → [10.815:965]

B:BD[10.965] → [4.759:825]

∅:D[4.825] → [7.112010:112042]

B:BD[7.112010] → [7.112010:112042]

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

Replacement in pijul/src/commands/pushpull.rs at line 39 [7.111631]

B:BD[11.1475] → [5.1640:1710]

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

[11.1475]

[7.112314]

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

Replacement in pijul/src/commands/pushpull.rs at line 76 [7.111631]

B:BD[7.113077] → [12.1106:1193]

B:BD[12.1193] → [4.826:892]

∅:D[4.892] → [7.113110:113142]

B:BD[7.113110] → [7.113110:113142]

    /// Path to the repository. Uses the current repository if the argument is omitted
    #[clap(long = "repository", value_hint = ValueHint::DirPath)]
    repo_path: Option<PathBuf>,

[7.113077]

[13.1615]

    #[clap(flatten)]
    base: RepoPath,

Replacement in pijul/src/commands/pushpull.rs at line 106 [7.111631]

B:BD[7.113567] → [10.966:1116]

B:BD[10.1116] → [4.954:1020]

∅:D[4.1020] → [7.113600:113632]

B:BD[7.113600] → [7.113600:113632]

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

[7.113567]

[13.2104]

    #[clap(flatten)]
    base: RepoPath,

Replacement in pijul/src/commands/pushpull.rs at line 179 [7.111631]

B:BD[14.1981] → [5.1711:1781]

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

[14.1981]

[7.114570]

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

Replacement in pijul/src/commands/pushpull.rs at line 182 [7.111631]

B:BD[15.6681] → [15.6681:6754]

B:BD[15.6754] → [2.481:531]

        let cur = txn
            .read()
            .current_channel()
            .unwrap_or(libpijul::DEFAULT_CHANNEL)

[15.6681]

[15.6801]

        let channel_name = get_channel(self.from_channel.as_deref(), &*txn.read())
            .0

Deletion in pijul/src/commands/pushpull.rs at line 185 [7.111631]

∅:D[15.6827] → [16.1772:1871]

B:BD[16.1772] → [16.1772:1871]

B:BD[16.1871] → [15.6828:6864]

        let channel_name = if let Some(ref c) = self.from_channel {
            c
        } else {
            cur.as_str()
        };

Replacement in pijul/src/commands/pushpull.rs at line 192 [7.111631]

B:BD[7.114936] → [7.114936:115226]

B:BD[7.115226] → [15.6865:6894]

∅:D[16.2010] → [7.115255:115325]

∅:D[15.6894] → [7.115255:115325]

B:BD[7.115255] → [7.115255:115325]

B:BD[7.115325] → [15.6895:6920]

∅:D[16.2045] → [7.115350:115361]

∅:D[15.6920] → [7.115350:115361]

B:BD[7.115350] → [7.115350:115361]

        let mut push_channel = None;
        let remote_channel = if let Some(ref c) = self.to_channel {
            let c = CHANNEL.captures(c).unwrap();
            push_channel = c.get(3).map(|x| x.as_str());
            let c = c.get(1).unwrap().as_str();
            if c.is_empty() {
                channel_name
            } else {
                c
            }
        } else {
            channel_name
        };

[7.114936]

[7.115361]


        let (remote_channel, push_channel) = self
            .to_channel
            .as_deref()
            .map(|c| {
                let c = CHANNEL.captures(c).unwrap();
                let push_channel = c.get(3).map(|x| x.as_str());
                let remote_channel = Some(c.get(1).unwrap().as_str()).filter(|v| !v.is_empty());
                (remote_channel, push_channel)
            })
            .unwrap_or_default();
        let remote_channel = remote_channel.unwrap_or(&channel_name);

Replacement in pijul/src/commands/pushpull.rs at line 364 [7.111631]

B:BD[7.117585] → [5.1782:1856]

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

[7.117585]

[15.9020]

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

Replacement in pijul/src/commands/pushpull.rs at line 366 [7.111631]

B:BD[15.9070] → [15.9070:9143]

B:BD[15.9143] → [2.532:582]

∅:D[2.582] → [15.9190:9216]

B:BD[15.9190] → [15.9190:9216]

∅:D[15.9216] → [17.0:66]

B:BD[16.2188] → [17.0:66]

∅:D[17.66] → [16.2256:2287]

B:BD[16.2256] → [16.2256:2287]

B:BD[16.2287] → [15.9217:9253]

∅:D[15.9253] → [16.2335:2389]

B:BD[16.2335] → [16.2335:2389]

        let cur = txn
            .read()
            .current_channel()
            .unwrap_or(libpijul::DEFAULT_CHANNEL)
            .to_string();
        let channel_name = if let Some(ref c) = self.to_channel {
            c
        } else {
            cur.as_str()
        };
        let is_current_channel = channel_name == cur;

[15.9070]

[15.9254]


        let txn_read = txn.read();
        let (channel_name, is_current_channel) =
            get_channel(self.to_channel.as_deref(), &*txn_read);
        let channel_name = channel_name.to_string();
        drop(txn_read);

Replacement in pijul/src/commands/pushpull.rs at line 382 [7.111631]

B:BD[7.118138] → [7.118138:118237]

B:BD[7.118237] → [2.583:621]

∅:D[2.621] → [7.118272:118283]

B:BD[7.118272] → [7.118272:118283]

        let from_channel = if let Some(ref c) = self.from_channel {
            c
        } else {
            libpijul::DEFAULT_CHANNEL
        };

[7.118138]

[18.1400]

        let from_channel = self
            .from_channel
            .as_deref()
            .unwrap_or(libpijul::DEFAULT_CHANNEL);