tzemanovic/inflorescence - Change 5ZM3J2J3LPIALWZNO5E5F6QOC325DADSKGY3W6TFDSQGEB5OPT7QC

add opts to select remote and channel for compare remote

Created by tzemanovic on April 1, 2026

5ZM3J2J3LPIALWZNO5E5F6QOC325DADSKGY3W6TFDSQGEB5OPT7QC

Dependencies

In channels

main

Change contents

Replacement in libflorescence/src/repo.rs at line 158 [22.7]
B:BD[18.1642] → [18.1642:1667]
```
        channel: String,
```
[18.1642]
[12.86]
```
        remote_channel: String,
```
Replacement in libflorescence/src/repo.rs at line 205 [22.7]
B:BD[18.1761] → [18.1761:1786]
```
        channel: String,
```
[18.1761]
[18.1786]
```
        remote_channel: String,
```
Replacement in libflorescence/src/repo.rs at line 213 [22.7]
B:BD[18.1908] → [18.1908:1933]
```
    pub channel: String,
```
[18.1908]
[12.224]
```
    pub remote_channel: String,
```

Replacement in libflorescence/src/repo.rs at line 628 [22.7]

B:BD[11.2032] → [18.1934:1988]

        MsgIn::CompareRemote { remote, channel } => {

[11.2032]

[18.1988]

        MsgIn::CompareRemote {
            remote,
            remote_channel,
        } => {

Replacement in libflorescence/src/repo.rs at line 633 [22.7]

B:BD[18.2013] → [18.2013:2091]

                compare_remote(&mut internal_state, &remote, &channel).await;

[18.2013]

[18.2091]

                compare_remote(&mut internal_state, &remote, &remote_channel)
                    .await;

Replacement in libflorescence/src/repo.rs at line 638 [22.7]
B:BD[18.2200] → [18.2200:2225]
```
                channel,
```
[18.2200]
[18.2225]
```
                remote_channel,
```
Replacement in libflorescence/src/repo.rs at line 1789 [22.7]
B:BD[18.2959] → [18.2959:2983]
```
    channel_name: &str,
```
[18.2959]
[18.2983]
```
    remote_channel_name: &str,
```

Replacement in libflorescence/src/repo.rs at line 1798 [22.7]

B:BD[18.3182] → [18.3182:3228]

        .open_or_create_channel(channel_name)

[18.3182]

[18.3228]

        .open_or_create_channel(&current_channel(&internal_state.repo)?)

Deletion in libflorescence/src/repo.rs at line 1802 [22.7]
B:BD[18.3353] → [18.3353:3403]
```
    let from_channel = libpijul::DEFAULT_CHANNEL;
```
Replacement in libflorescence/src/repo.rs at line 1808 [22.7]
B:BD[18.3574] → [18.3574:3596]
```
        from_channel,
```
[18.3574]
[18.3596]
```
        remote_channel_name,
```

Replacement in libflorescence/src/repo.rs at line 1874 [22.7]

B:BD[18.5332] → [18.5332:5375]

        channel: channel_name.to_string(),

[18.5332]

[18.5375]

        remote_channel: remote_channel_name.to_string(),

Insertion in inflorescence_view/src/view.rs at line 25 [4.12409]
[4.12674]
[5.392]
```
use std::borrow::Cow;
```

Insertion in inflorescence_view/src/view.rs at line 49 [4.12409]

[20.494]

[9.404]

    SubMenuCompareRemoteSelectRemote(String),
    SubMenuCompareRemoteInputRemoteChannel(String),

Insertion in inflorescence_view/src/view.rs at line 103 [4.12409]

[19.1085]

            model::SubMenu::CompareRemote {
                opt: Some(opt),
                remote: _,
                remote_channel: _,
            } => match opt {
                model::CompareRemoteOption::SelectingRemote { remote } => {
                    return compare_remote_selecting_remote(
                        state,
                        *window_size,
                        allowed_actions,
                        report,
                        remote,
                        sub_menu,
                    );
                }
                model::CompareRemoteOption::InputingRemoteChannel {
                    channel: remote_channel,
                } => {
                    return compare_remote_input_remote_channel(
                        *window_size,
                        allowed_actions,
                        report,
                        remote_channel,
                        sub_menu,
                    );
                }
            },

Replacement in inflorescence_view/src/view.rs at line 133 [4.12409]

B:BD[19.1213] → [19.1213:1408]

            | model::SubMenu::InitRepo { .. }
            | model::SubMenu::ImportFromGit { .. }
            | model::SubMenu::Add { .. }
            | model::SubMenu::CompareRemote { .. } => {}

[19.1213]

[13.19028]

            | model::SubMenu::InitRepo { path: _ }
            | model::SubMenu::ImportFromGit { path: _ }
            | model::SubMenu::Add { recursive: _ }
            | model::SubMenu::CompareRemote { opt: None, .. } => {}

Insertion in inflorescence_view/src/view.rs at line 429 [4.12409]

[20.1938]

fn compare_remote_selecting_remote<'a>(
    state: &'a model::State,
    window_size: iced::Size,
    allowed_actions: &'a [action::Binding],
    report: &'a report::Container,
    remote: &'a Option<String>,
    sub_menu: &'a Option<model::SubMenu>,
) -> Element<'a, Msg, Theme> {
    view_selecting_remote(
        state,
        window_size,
        allowed_actions,
        report,
        remote,
        sub_menu,
        Msg::SubMenuCompareRemoteSelectRemote,
    )
}
fn compare_remote_input_remote_channel<'a>(
    window_size: iced::Size,
    allowed_actions: &'a [action::Binding],
    report: &'a report::Container,
    remote: &'a Option<String>,
    sub_menu: &'a Option<model::SubMenu>,
) -> Element<'a, Msg, Theme> {
    view_input_remote_channel(
        window_size,
        allowed_actions,
        report,
        remote,
        sub_menu,
        Msg::SubMenuCompareRemoteInputRemoteChannel,
    )
}

Insertion in inflorescence_view/src/view.rs at line 510 [4.12409]

[17.1245]


fn view_input_remote_channel<'a>(
    window_size: iced::Size,
    allowed_actions: &'a [action::Binding],
    report: &'a report::Container,
    channel: &'a Option<String>,
    sub_menu: &'a Option<model::SubMenu>,
    on_input: impl Fn(String) -> Msg + Copy + 'static,
) -> Element<'a, Msg, Theme> {
    let main = el(column([
        view_header("Name of a remote channel:"),
        el(text("Hint: to view a changes from e.g. a discussion number 42 enter \"name:42\".")),
        el(text_input(
            "",
            channel
                .as_ref()
                .map(Cow::Borrowed)
                .unwrap_or_default()
                .as_ref(),
        )
        .on_input(on_input)),
    ]));
    let main = el(container(main).width(Length::Fill).height(Length::Fill));

Insertion in inflorescence_view/src/view.rs at line 535 [4.12409]

[17.1246]

    add_actions_and_report(
        None,
        main,
        window_size,
        allowed_actions,
        report,
        sub_menu,
        false,
    )
}

Replacement in inflorescence_view/src/view.rs at line 582 [4.12409]

B:BD[19.3837] → [19.3837:3872]

B:BD[19.3872] → [20.2534:2596]

B:BD[20.2633] → [20.2633:2763]

            model::SubMenu::Push {
                opt: _,
                remote: Some(remote),
            } => {
                actions_inner =
                    actions_inner.push(el(text(format!("Remote: {remote}"))));

[19.3837]

[20.2763]

            model::SubMenu::Push { opt: _, remote } => {
                if let Some(remote) = remote {
                    actions_inner = actions_inner
                        .push(el(text(format!("Remote: {remote}"))));
                }

Replacement in inflorescence_view/src/view.rs at line 588 [4.12409]

B:BD[20.2777] → [20.2777:2812]

            model::SubMenu::Pull {

[20.2777]

[19.3872]

            model::SubMenu::Pull { opt: _, remote } => {
                if let Some(remote) = remote {
                    actions_inner = actions_inner
                        .push(el(text(format!("Remote: {remote}"))));
                }
            }
            model::SubMenu::CompareRemote {

Replacement in inflorescence_view/src/view.rs at line 596 [4.12409]

B:BD[19.3896] → [19.3896:3934]

                remote: Some(remote),

[19.3896]

[19.3934]

                remote,
                remote_channel,

Replacement in inflorescence_view/src/view.rs at line 599 [4.12409]

B:BD[19.3953] → [19.3953:4064]

                actions_inner =
                    actions_inner.push(el(text(format!("Remote: {remote}"))));

[19.3953]

[19.4064]

                if let Some(remote) = remote {
                    actions_inner = actions_inner
                        .push(el(text(format!("Remote: {remote}"))));
                }
                if let Some(channel) = remote_channel {
                    actions_inner = actions_inner
                        .push(el(text(format!("Remote channel: {channel}"))));
                }

Replacement in inflorescence_view/src/view.rs at line 608 [4.12409]

B:BD[19.4078] → [19.4078:4132]

B:BD[19.4132] → [20.2851:2907]

∅:D[20.2907] → [19.4167:4404]

B:BD[19.4167] → [19.4167:4404]

            model::SubMenu::Push { remote: None, .. }
            | model::SubMenu::Pull { remote: None, .. }
            | model::SubMenu::ResetChange
            | model::SubMenu::InitRepo { .. }
            | model::SubMenu::ImportFromGit { .. }
            | model::SubMenu::Add { .. }
            | model::SubMenu::CompareRemote { .. } => {}

[19.4078]

[19.4404]

            model::SubMenu::ResetChange
            | model::SubMenu::InitRepo { path: _ }
            | model::SubMenu::ImportFromGit { path: _ }
            | model::SubMenu::Add { recursive: _ } => {}

Replacement in inflorescence_view/src/view.rs at line 654 [4.12409]
B:BD[8.4551] → [18.5418:5443]
```
                remotes,
```
[8.4551]
[7.2870]
```
                remotes: _,
```

Replacement in inflorescence_view/src/view.rs at line 1683 [4.12409]

B:BD[18.7605] → [18.7605:7891]

        if let Some(record_dichotomy) =
            remotes.default.as_ref().and_then(|default_remote| {
                model::get_record_dichotomy(
                    record_dichotomy,
                    default_remote,
                    channel,
                )
            })

[18.7605]

[18.7891]

        if let selection::Unified::CompareRemote(Some(
            selection::CompareRemote {
                ix: _,
                hash: _,
                file: _,
                remote,
                remote_channel,
            },
        )) = selection
            && let Some(record_dichotomy) = model::get_record_dichotomy(
                record_dichotomy,
                remote,
                remote_channel,
            )

Replacement in inflorescence_view/src/view.rs at line 1722 [4.12409]

B:BD[18.8977] → [18.8977:9021]

                                channel: _,

[18.8977]

[18.9021]

                                remote_channel: _,

Replacement in inflorescence_view/src/view.rs at line 1805 [4.12409]

B:BD[18.12101] → [18.12101:12148]

            remote: _,
            channel: _,

[18.12101]

[18.12148]

            remote,
            remote_channel,

Replacement in inflorescence_view/src/view.rs at line 1809 [4.12409]

B:BD[18.12226] → [18.12226:12502]

                remotes.default.as_ref().and_then(|default_remote| {
                    model::get_record_dichotomy(
                        record_dichotomy,
                        default_remote,
                        channel,
                    )
                }) {

[18.12226]

[18.12502]

                model::get_record_dichotomy(
                    record_dichotomy,
                    remote,
                    remote_channel,
                ) {

Replacement in inflorescence_view/src/view.rs at line 1895 [4.12409]
B:BD[18.15846] → [18.15846:15870]
```
            channel: _,
```
[18.15846]
[18.15870]
```
            remote_channel: _,
```

Replacement in inflorescence_view/src/view.rs at line 2176 [4.12409]

B:BD[12.4692] → [18.16830:16897]

        Job::CompareRemote { remote, channel } => el(text(format!(

[12.4692]

[18.16897]

        Job::CompareRemote {
            remote,
            remote_channel: channel,
        } => el(text(format!(

Replacement in inflorescence_model/src/selection.rs at line 148 [23.3124]
B:BD[18.17783] → [18.17783:17808]
```
    pub channel: String,
```
[18.17783]
[8.30483]
```
    pub remote_channel: String,
```
Insertion in inflorescence_model/src/model.rs at line 105 [10.3550]
[18.18099]
[18.18099]
```
        /// Confirmed remote selection
```

Replacement in inflorescence_model/src/model.rs at line 107 [10.3550]

B:BD[18.18131] → [18.18131:18164]

        channel: Option<String>,

[18.18131]

[18.18164]

        /// Confirmed remote channel selection
        remote_channel: Option<String>,
        opt: Option<CompareRemoteOption>,

Insertion in inflorescence_model/src/model.rs at line 129 [10.3550]

[20.4203]

[10.4338]

#[derive(Clone, Debug, PartialEq, Eq, Hash)]
pub enum CompareRemoteOption {
    SelectingRemote {
        /// Set while selecting remote and discarded on cancel
        remote: Option<String>,
    },
    InputingRemoteChannel {
        /// Set while selecting channel and discarded on cancel
        channel: Option<String>,
    },
}

Replacement in inflorescence_model/src/model.rs at line 177 [10.3550]

B:BD[12.5181] → [18.18172:18231]

    // Outer key is remote name, inner key is channel name

[12.5181]

[18.18231]

    // Outer key is remote name, inner key is remote channel name

Replacement in inflorescence_model/src/model.rs at line 188 [10.3550]
B:BD[18.18482] → [18.18482:18501]
```
    channel: &str,
```
[18.18482]
[18.18501]
```
    remote_channel: &str,
```
Replacement in inflorescence_model/src/model.rs at line 192 [10.3550]
B:BD[18.18584] → [18.18584:18626]
```
        .and_then(|map| map.get(channel))
```
[18.18584]
[10.5171]
```
        .and_then(|map| map.get(remote_channel))
```

Replacement in inflorescence_model/src/model.rs at line 268 [10.3550]

B:BD[12.5258] → [20.4204:4250]

∅:D[20.4250] → [19.4998:5044]

B:BD[12.5288] → [19.4998:5044]

∅:D[19.5044] → [18.19259:19314]

B:BD[12.5318] → [18.19259:19314]

    Pull { remote: String, channel: String },
    Push { remote: String, channel: String },
    CompareRemote { remote: String, channel: String },

[12.5258]

[10.6686]

    Pull {
        remote: String,
        channel: String,
    },
    Push {
        remote: String,
        channel: String,
    },
    CompareRemote {
        remote: String,
        remote_channel: String,
    },

Insertion in inflorescence_model/src/action.rs at line 60 [9.3501]
[20.4297]
[17.2285]
```
    SubMenuCompareRemoteOption(model::CompareRemoteOption),
```

Insertion in inflorescence_model/src/action.rs at line 132 [9.3501]

[21.1362]

[17.2306]

        (
            SubMenuCompareRemoteOption(left),
            SubMenuCompareRemoteOption(right),
        ) => core::mem::discriminant(left) == core::mem::discriminant(right),

Insertion in inflorescence_model/src/action.rs at line 160 [9.3501]
[20.4421]
[17.2357]
```
        (SubMenuCompareRemoteOption(_), _) => false,
```

Replacement in inflorescence_model/src/action.rs at line 290 [9.3501]

B:BD[18.19390] → [18.19390:19418]

                channel: _,

[18.19390]

[18.19418]

                remote_channel: _,
                opt,

Replacement in inflorescence_model/src/action.rs at line 293 [9.3501]

B:BD[18.19437] → [18.19437:20258]

                // TODO select remote name
                // TODO select local and remote channel
                vec![
                    Binding {
                        keys_str: "Enter | S-c",
                        keys: ModKeys::Two(
                            ModKey {
                                key: Key::Named(Named::Enter),
                                mods: Mods::NONE,
                            },
                            ModKey {
                                key: Key::Character("c".into()),
                                mods: Mods::SHIFT,
                            },
                        ),
                        label: "compare default remote",
                        msg: Some(FilteredMsg::Confirm),
                    },
                    cancel(),
                ]

[18.19437]

[18.20258]

                if let Some(opt) = opt {
                    let confirm_label = match opt {
                        model::CompareRemoteOption::SelectingRemote {
                            ..
                        } => "confirm remote selection",
                        model::CompareRemoteOption::InputingRemoteChannel {
                            ..
                        } => "confirm channel input",
                    };
                    vec![confirm(confirm_label), down(), up(), cancel()]
                } else {
                    vec![
                        Binding {
                            keys_str: "Enter | S-c",
                            keys: ModKeys::Two(
                                ModKey {
                                    key: Key::Named(Named::Enter),
                                    mods: Mods::NONE,
                                },
                                ModKey {
                                    key: Key::Character("c".into()),
                                    mods: Mods::SHIFT,
                                },
                            ),
                            label: "compare remote",
                            msg: Some(FilteredMsg::Confirm),
                        },
                        select_remote(Some(
                            FilteredMsg::SubMenuCompareRemoteOption(
                                model::CompareRemoteOption::SelectingRemote {
                                    remote: None,
                                },
                            ),
                        )),
                        select_remote_channel(Some(
                            FilteredMsg::SubMenuCompareRemoteOption(
                                model::CompareRemoteOption::InputingRemoteChannel {
                                    channel: None,
                                },
                            ),
                        )),
                        cancel(),
                    ]
                }

Replacement in inflorescence_model/src/action.rs at line 850 [9.3501]

B:BD[18.20715] → [18.20715:20750]

                    channel: None,

[18.20715]

[18.20750]

                    remote_channel: None,
                    opt: None,

Replacement in inflorescence_model/src/action.rs at line 1243 [9.3501]
B:BD[9.15165] → [18.22417:22442]
```
                remotes,
```
[9.15165]
[9.15165]
```
                remotes: _,
```

Replacement in inflorescence_model/src/action.rs at line 1523 [9.3501]

B:BD[18.22619] → [18.22619:22959]

            let has_any_diff = remotes
                .default
                .as_ref()
                .and_then(|default_remote| {
                    model::get_record_dichotomy(
                        record_dichotomy,
                        default_remote,
                        channel,
                    )
                })

[18.22619]

[18.22959]

            if let Some(selection::CompareRemote {
                ix: _,
                hash: _,
                file,
                remote,
                remote_channel,
            }) = compare_remote_selection
            {
                let has_any_diff = model::get_record_dichotomy(
                    record_dichotomy,
                    remote,
                    remote_channel,
                )

Deletion in inflorescence_model/src/action.rs at line 1538 [9.3501]

B:BD[18.23034] → [18.23034:23154]

            if let Some(selection::CompareRemote { file, .. }) =
                compare_remote_selection
            {

Replacement in inflorescence_model/src/action.rs at line 1566 [9.3501]
B:BD[18.24374] → [18.24374:24408]
```
                    has_any_diff,
```
[18.24374]
[18.24408]
```
                    has_any_diff: false,
```

Insertion in inflorescence_model/src/action.rs at line 1729 [9.3501]

[20.6686]

        msg,
    }
}
fn select_remote_channel(msg: Option<FilteredMsg>) -> Binding {
    Binding {
        keys_str: "c",
        keys: ModKeys::One(ModKey {
            key: Key::Character("c".into()),
            mods: Mods::NONE,
        }),
        label: "select remote channel",

Replacement in inflorescence/src/selection.rs at line 564 [24.26]
B:BD[18.25333] → [18.25333:25358]
```
                channel,
```
[18.25333]
[18.25358]
```
                remote_channel: channel,
```

Replacement in inflorescence/src/selection.rs at line 586 [24.26]

B:BD[18.26176] → [18.26176:26213]

                            channel,

[18.26176]

[18.26213]

                            remote_channel: channel,

Replacement in inflorescence/src/selection.rs at line 622 [24.26]

B:BD[18.27551] → [18.27551:27588]

                            channel,

[18.27551]

[18.27588]

                            remote_channel: channel,

Replacement in inflorescence/src/selection.rs at line 1081 [24.26]
B:BD[18.29368] → [18.29368:29393]
```
                channel,
```
[18.29368]
[18.29393]
```
                remote_channel: channel,
```

Replacement in inflorescence/src/selection.rs at line 1103 [24.26]

B:BD[18.30211] → [18.30211:30248]

                            channel,

[18.30211]

[18.30248]

                            remote_channel: channel,

Replacement in inflorescence/src/selection.rs at line 1136 [24.26]

B:BD[18.31478] → [18.31478:31515]

                            channel,

[18.31478]

[18.31515]

                            remote_channel: channel,

Replacement in inflorescence/src/selection.rs at line 1473 [24.26]
B:BD[18.33341] → [18.33341:33370]
```
                    channel,
```
[18.33341]
[18.33370]
```
                    remote_channel: channel,
```

Replacement in inflorescence/src/selection.rs at line 1486 [24.26]

B:BD[18.33875] → [18.33875:33916]

                                channel,

[18.33875]

[18.33916]

                                remote_channel: channel,

Replacement in inflorescence/src/selection.rs at line 1496 [24.26]

B:BD[18.34243] → [18.34243:34280]

                            channel,

[18.34243]

[18.34280]

                            remote_channel: channel,

Replacement in inflorescence/src/selection.rs at line 1884 [24.26]
B:BD[18.35104] → [18.35104:35129]
```
                channel,
```
[18.35104]
[18.35129]
```
                remote_channel: channel,
```

Replacement in inflorescence/src/selection.rs at line 1926 [24.26]

B:BD[18.37076] → [18.37076:37113]

                            channel,

[18.37076]

[18.37113]

                            remote_channel: channel,

Replacement in inflorescence/src/selection.rs at line 1949 [24.26]

B:BD[18.37982] → [18.37982:38019]

                            channel,

[18.37982]

[18.38019]

                            remote_channel: channel,

Replacement in inflorescence/src/selection.rs at line 1960 [24.26]

B:BD[18.38341] → [18.38341:38374]

                        channel,

[18.38341]

[18.38374]

                        remote_channel: channel,

Replacement in inflorescence/src/selection.rs at line 2279 [24.26]
B:BD[18.39502] → [18.39502:39531]
```
                    channel,
```
[18.39502]
[18.39531]
```
                    remote_channel: channel,
```

Replacement in inflorescence/src/selection.rs at line 2313 [24.26]

B:BD[18.40952] → [18.40952:40989]

                            channel,

[18.40952]

[18.40989]

                            remote_channel: channel,

Replacement in inflorescence/src/selection.rs at line 2823 [24.26]
B:BD[18.43088] → [18.43088:43105]
```
        channel,
```
[18.43088]
[18.43105]
```
        remote_channel: channel,
```

Replacement in inflorescence/src/main.rs at line 472 [25.2763]

B:BD[20.6779] → [20.6779:6852]

            | action::FilteredMsg::SubMenuPullOption(_) => Task::none(),

[20.6779]

[16.4920]

            | action::FilteredMsg::SubMenuPullOption(_)
            | action::FilteredMsg::SubMenuCompareRemoteOption(_) => {
                Task::none()
            }

Replacement in inflorescence/src/main.rs at line 497 [25.2763]

B:BD[20.6901] → [20.6901:6966]

        | view::Msg::SubMenuPullSelectRemote(_) => Task::none(),

[20.6901]

[14.21507]

        | view::Msg::SubMenuPullSelectRemote(_)
        | view::Msg::SubMenuCompareRemoteSelectRemote(_)
        | view::Msg::SubMenuCompareRemoteInputRemoteChannel(_) => Task::none(),

Replacement in inflorescence/src/main.rs at line 1008 [25.2763]

B:BD[20.7078] → [20.7078:7151]

            | action::FilteredMsg::SubMenuPullOption(_) => Task::none(),

[20.7078]

[15.19107]

            | action::FilteredMsg::SubMenuPullOption(_)
            | action::FilteredMsg::SubMenuCompareRemoteOption(_) => {
                Task::none()
            }

Replacement in inflorescence/src/main.rs at line 1029 [25.2763]

B:BD[20.7200] → [20.7200:7265]

        | view::Msg::SubMenuPullSelectRemote(_) => Task::none(),

[20.7200]

[13.3616655]

        | view::Msg::SubMenuPullSelectRemote(_)
        | view::Msg::SubMenuCompareRemoteSelectRemote(_)
        | view::Msg::SubMenuCompareRemoteInputRemoteChannel(_) => Task::none(),

Replacement in inflorescence/src/main.rs at line 1102 [25.2763]

B:BD[18.44236] → [18.44236:44274]

                             channel,

[18.44236]

[18.44274]

                             remote_channel,

Replacement in inflorescence/src/main.rs at line 1107 [25.2763]

B:BD[18.44451] → [18.44451:44492]

                                channel,

[18.44451]

[18.44492]

                                remote_channel,

Replacement in inflorescence/src/main.rs at line 1165 [25.2763]

B:BD[19.7943] → [19.7943:8017]

            if let Some(model::SubMenu::Push { remote, .. }) = sub_menu {

[19.7943]

[20.7266]

            if let Some(model::SubMenu::Push {
                opt: Some(model::PushOption::SelectingRemote { remote }),
                ..
            }) = sub_menu
            {

Replacement in inflorescence/src/main.rs at line 1175 [25.2763]

B:BD[20.7417] → [20.7417:7491]

            if let Some(model::SubMenu::Pull { remote, .. }) = sub_menu {

[20.7417]

[19.8017]

            if let Some(model::SubMenu::Pull {
                opt: Some(model::PullOption::SelectingRemote { remote }),
                ..
            }) = sub_menu
            {
                *remote = Some(selection);
            }
            Task::none()
        }
        view::Msg::SubMenuCompareRemoteSelectRemote(selection) => {
            if let Some(model::SubMenu::CompareRemote {
                opt:
                    Some(model::CompareRemoteOption::SelectingRemote { remote }),
                ..
            }) = sub_menu
            {

Insertion in inflorescence/src/main.rs at line 1192 [25.2763]

[19.8060]

[17.9917]

            }
            Task::none()
        }
        view::Msg::SubMenuCompareRemoteInputRemoteChannel(input) => {
            if let Some(model::SubMenu::CompareRemote {
                opt:
                    Some(model::CompareRemoteOption::InputingRemoteChannel {
                        channel,
                    }),
                ..
            }) = sub_menu
            {
                *channel = Some(input);

Replacement in inflorescence/src/main.rs at line 1255 [25.2763]

B:BD[18.44685] → [18.44685:44799]

            Some(model::SubMenu::CompareRemote { remote, channel }) => {
                if let Some(ReadyState {

[18.44685]

[18.44799]

            Some(model::SubMenu::CompareRemote {
                remote,
                remote_channel,
                opt,
            }) => {
                if let Some(opt) = opt {
                    match opt {
                        model::CompareRemoteOption::SelectingRemote {
                            remote,
                        } => {
                            *sub_menu = Some(model::SubMenu::CompareRemote {
                                remote: remote.clone(),
                                remote_channel: remote_channel.clone(),
                                opt: None,
                            });
                            Task::none()
                        }
                        model::CompareRemoteOption::InputingRemoteChannel {
                            channel,
                        } => {
                            *sub_menu = Some(model::SubMenu::CompareRemote {
                                remote: remote.clone(),
                                remote_channel: channel.clone(),
                                opt: None,
                            });
                            Task::none()
                        }
                    }
                } else if let Some(ReadyState {

Replacement in inflorescence/src/main.rs at line 1295 [25.2763]

B:BD[18.45190] → [18.45190:45236]

                        let channel = channel

[18.45190]

[18.45236]

                        let remote_channel = remote_channel

Replacement in inflorescence/src/main.rs at line 1300 [25.2763]

B:BD[18.45459] → [18.45459:45513]

                            channel: channel.clone(),

[18.45459]

[18.45513]

                            remote_channel: remote_channel.clone(),

Replacement in inflorescence/src/main.rs at line 1309 [25.2763]

B:BD[18.45917] → [18.45917:45975]

                                channel: channel.clone(),

[18.45917]

[18.45975]

                                remote_channel: remote_channel.clone(),

Replacement in inflorescence/src/main.rs at line 1315 [25.2763]

B:BD[18.46180] → [18.46180:46221]

                                channel,

[18.46180]

[18.46221]

                                remote_channel,

Replacement in inflorescence/src/main.rs at line 1321 [25.2763]

B:BD[18.46398] → [18.46398:46470]

                            "No default remote configured".to_string(),

[18.46398]

[18.46470]

                            "Missing remote configuration (check your `.pijul/config.toml`)".to_string(),

Insertion in inflorescence/src/main.rs at line 1325 [25.2763]

[18.46557]

                    Task::none()
                } else {
                    Task::none()

Deletion in inflorescence/src/main.rs at line 1329 [25.2763]
B:BD[18.46575] → [18.46575:46604]
```
                Task::none()
```

Insertion in inflorescence/src/main.rs at line 1426 [25.2763]

[20.9084]

                                remote,
                                opt: None,
                            });
                            return Task::none();
                        }
                    }
                    model::SubMenu::CompareRemote {
                        remote,
                        remote_channel,
                        opt,
                    } => {
                        if opt.is_some() {
                            *sub_menu = Some(model::SubMenu::CompareRemote {

Insertion in inflorescence/src/main.rs at line 1440 [25.2763]

[20.9124]

[19.8779]

                                remote_channel,

Replacement in inflorescence/src/main.rs at line 1447 [25.2763]

∅:D[20.9279] → [19.8993:9220]

B:BD[19.8993] → [19.8993:9220]

                    | model::SubMenu::InitRepo { .. }
                    | model::SubMenu::ImportFromGit { .. }
                    | model::SubMenu::Add { .. }
                    | model::SubMenu::CompareRemote { .. } => {}

[20.9279]

[19.9220]

                    | model::SubMenu::InitRepo { path: _ }
                    | model::SubMenu::ImportFromGit { path: _ }
                    | model::SubMenu::Add { recursive: _ } => {}

Replacement in inflorescence/src/main.rs at line 1484 [25.2763]

B:BD[19.9310] → [19.9310:9353]

B:BD[19.9353] → [20.9280:9315]

∅:D[20.9357] → [19.9385:9452]

B:BD[19.9385] → [19.9385:9452]

                    model::SubMenu::Push {
                        remote: _,
                        opt: Some(opt),
                    } => {

[19.9310]

[19.9452]

                    model::SubMenu::Push { opt: Some(opt), .. } => {

Replacement in inflorescence/src/main.rs at line 1491 [25.2763]

B:BD[20.9599] → [20.9599:9677]

B:BD[20.9719] → [20.9719:9786]

                    model::SubMenu::Pull {
                        remote: _,
                        opt: Some(opt),
                    } => {

[20.9599]

[20.9786]

                    model::SubMenu::Pull { opt: Some(opt), .. } => {

Replacement in inflorescence/src/main.rs at line 1498 [25.2763]

B:BD[19.9795] → [19.9795:9843]

B:BD[19.9843] → [20.10157:10207]

                    model::SubMenu::Push { .. }
                    | model::SubMenu::Pull { .. }

[19.9795]

[19.9886]

                    model::SubMenu::CompareRemote {
                        opt: Some(opt), ..
                    } => {
                        if let Some(ReadyState { repo, .. }) =
                            model::is_ready_mut(model)
                        {
                            return sub_menu_compare_remote_opt_selection(
                                msg, opt, repo,
                            );
                        }
                    }
                    model::SubMenu::Push { opt: _, remote: _ }
                    | model::SubMenu::Pull { opt: _, remote: _ }
                    | model::SubMenu::CompareRemote {
                        opt: _,
                        remote: _,
                        remote_channel: _,
                    }

Replacement in inflorescence/src/main.rs at line 1517 [25.2763]

B:BD[19.9936] → [19.9936:10163]

                    | model::SubMenu::InitRepo { .. }
                    | model::SubMenu::ImportFromGit { .. }
                    | model::SubMenu::Add { .. }
                    | model::SubMenu::CompareRemote { .. } => {}

[19.9936]

[19.10163]

                    | model::SubMenu::InitRepo { path: _ }
                    | model::SubMenu::ImportFromGit { path: _ }
                    | model::SubMenu::Add { recursive: _ } => {}

Replacement in inflorescence/src/main.rs at line 1539 [25.2763]

B:BD[18.47120] → [18.47120:47158]

                             channel,

[18.47120]

[18.47158]

                             remote_channel,

Replacement in inflorescence/src/main.rs at line 1544 [25.2763]

B:BD[18.47335] → [18.47335:47376]

                                channel,

[18.47335]

[18.47376]

                                remote_channel,

Insertion in inflorescence/src/main.rs at line 1740 [25.2763]

[20.10988]

                *opt = Some(new_opt);
            }
            Task::none()
        }
        action::FilteredMsg::SubMenuCompareRemoteOption(mut new_opt) => {
            if let Some(model::SubMenu::CompareRemote {
                opt,
                remote,
                remote_channel,
            }) = sub_menu
            {
                let task = match &mut new_opt {
                    model::CompareRemoteOption::SelectingRemote {
                        remote: selecting_remote,
                    } => {
                        *selecting_remote = remote.clone();
                        Task::none()
                    }
                    model::CompareRemoteOption::InputingRemoteChannel {
                        channel: selecting_channel,
                    } => {
                        *selecting_channel = remote_channel.clone();
                        task::widget_focus_next()
                    }
                };

Insertion in inflorescence/src/main.rs at line 1766 [25.2763]
[20.11026]
[20.11026]
```
                return task;
```
Replacement in inflorescence/src/main.rs at line 1889 [25.2763]
B:BD[18.47848] → [18.47848:47876]
```
                channel: _,
```
[18.47848]
[18.47876]
```
                remote_channel: _,
```

Insertion in inflorescence/src/main.rs at line 1948 [25.2763]

[21.3107]

[20.11630]

            remote_selection(msg, remote, remote_names)
        }
    }
}
fn sub_menu_compare_remote_opt_selection(
    msg: selection::Msg,
    opt: &mut model::CompareRemoteOption,
    repo: &mut repo::State,
) -> Task<Msg> {
    match opt {
        model::CompareRemoteOption::SelectingRemote { remote } => {
            let repo::Remotes { default, other } = &repo.remotes;
            let remote_names: Vec<_> = default.iter().chain(other).collect();

Insertion in inflorescence/src/main.rs at line 1963 [25.2763]

[20.11686]

        }
        model::CompareRemoteOption::InputingRemoteChannel { channel: _ } => {
            // Remote channel is just a text input
            Task::none()

Replacement in inflorescence/src/main.rs at line 2355 [25.2763]
B:BD[18.51748] → [18.51748:51769]
```
            channel,
```
[18.51748]
[18.51769]
```
            remote_channel,
```
Replacement in inflorescence/src/main.rs at line 2362 [25.2763]
B:BD[18.51942] → [18.51942:51971]
```
                    channel,
```
[18.51942]
[18.51971]
```
                    remote_channel,
```

Replacement in inflorescence/src/main.rs at line 2371 [25.2763]

B:BD[18.52285] → [18.52285:52334]

                            .insert(channel, d);

[18.52285]

[18.52334]

                            .insert(remote_channel, d);

Replacement in inflorescence/src/main.rs at line 2376 [25.2763]

B:BD[18.52434] → [18.52434:52554]

                        format!("Failed to compare with remote with {err:?}. Remote {remote:?}, channel: {channel:?}");

[18.52434]

[18.52554]

                        format!("Failed to compare with remote with {err:?}. Remote {remote:?}, channel: {remote_channel:?}");

Replacement in inflorescence/src/main.rs at line 2381 [25.2763]

B:BD[18.52717] → [18.52717:52792]

                jobs.swap_remove(&Job::CompareRemote { remote, channel });

[18.52717]

[18.52792]

                jobs.swap_remove(&Job::CompareRemote {
                    remote,
                    remote_channel,
                });