tzemanovic/inflorescence - Change OEBGSXWU7DKZTMIHOHJ6HECYMCPMOUIL7BVRWYTTTVASTEOB5QGQC

refactor sub-menu option selection

Created by tzemanovic on March 31, 2026

OEBGSXWU7DKZTMIHOHJ6HECYMCPMOUIL7BVRWYTTTVASTEOB5QGQC

Dependencies

In channels

main

Change contents

Deletion in inflorescence_view/src/view.rs at line 73 [9.12409]
B:BD[8.522] → [8.522:556]
```
                selecting_remote,
```

Replacement in inflorescence_view/src/view.rs at line 74 [9.12409]

B:BD[7.715] → [7.715:771]

                model::PushOption::SelectingRemote => {

[7.715]

[7.771]

                model::PushOption::SelectingRemote { remote } => {

Replacement in inflorescence_view/src/view.rs at line 80 [9.12409]

B:BD[7.963] → [8.557:599]

                        selecting_remote,

[7.963]

[8.599]

                        remote,

Deletion in inflorescence_view/src/view.rs at line 88 [9.12409]
B:BD[8.783] → [8.783:817]
```
                selecting_remote,
```

Replacement in inflorescence_view/src/view.rs at line 89 [9.12409]

B:BD[8.846] → [8.846:902]

                model::PullOption::SelectingRemote => {

[8.846]

[8.902]

                model::PullOption::SelectingRemote { remote } => {

Replacement in inflorescence_view/src/view.rs at line 95 [9.12409]

B:BD[8.1094] → [8.1094:1136]

                        selecting_remote,

[8.1094]

[7.995]

                        remote,

Deletion in inflorescence_view/src/view.rs at line 484 [9.12409]
B:BD[8.2596] → [8.2596:2633]
```
                selecting_remote: _,
```
Deletion in inflorescence_view/src/view.rs at line 491 [9.12409]
B:BD[7.3934] → [8.2813:2850]
```
                selecting_remote: _,
```
Deletion in inflorescence_view/src/view/test.rs at line 329 [10.4223]
B:BD[7.4770] → [8.3498:3530]
```
        selecting_remote: None,
```
Replacement in inflorescence_model/src/model.rs at line 85 [11.3550]
B:BD[7.4833] → [8.3758:3787]
```
        /// Confirmed remote
```
[7.4833]
[7.4833]
```
        /// Confirmed remote selection
```

Deletion in inflorescence_model/src/model.rs at line 87 [11.3550]

B:BD[7.4865] → [8.3788:3893]

        /// Set while selecting remote and discarded on cancel
        selecting_remote: Option<String>,

Replacement in inflorescence_model/src/model.rs at line 90 [11.3550]
B:BD[8.3905] → [8.3905:3934]
```
        /// Confirmed remote
```
[8.3905]
[8.3934]
```
        /// Confirmed remote selection
```

Deletion in inflorescence_model/src/model.rs at line 92 [11.3550]

B:BD[8.3966] → [8.3966:4071]

        /// Set while selecting remote and discarded on cancel
        selecting_remote: Option<String>,

Replacement in inflorescence_model/src/model.rs at line 120 [11.3550]

B:BD[7.4976] → [7.4976:4997]

    SelectingRemote,

[7.4976]

[3.531968]

    SelectingRemote {
        /// Set while selecting remote and discarded on cancel
        remote: Option<String>,
    },

Replacement in inflorescence_model/src/model.rs at line 128 [11.3550]

B:BD[8.4179] → [8.4179:4200]

    SelectingRemote,

[8.4179]

[8.4200]

    SelectingRemote {
        /// Set while selecting remote and discarded on cancel
        remote: Option<String>,
    },

Insertion in inflorescence_model/src/action.rs at line 123 [12.3501]

[7.5147]

            core::mem::discriminant(left) == core::mem::discriminant(right)
        }
        (SubMenuPushOption(left), SubMenuPushOption(right)) => {

Replacement in inflorescence_model/src/action.rs at line 128 [12.3501]

B:BD[7.5233] → [7.5233:5311]

B:BD[7.5311] → [8.4298:4376]

        (SubMenuPushOption(left), SubMenuPushOption(right)) => left == right,
        (SubMenuPullOption(left), SubMenuPullOption(right)) => left == right,

[7.5233]

[5.2306]

        (SubMenuPullOption(left), SubMenuPullOption(right)) => {
            core::mem::discriminant(left) == core::mem::discriminant(right)
        }

Replacement in inflorescence_model/src/action.rs at line 202 [12.3501]

B:BD[3.532243] → [8.4422:4561]

            model::SubMenu::Push {
                remote: _,
                selecting_remote: _,
                opt,
            } => {

[3.532243]

[7.5414]

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

Replacement in inflorescence_model/src/action.rs at line 221 [12.3501]

B:BD[8.4637] → [8.4637:4701]

                            model::PushOption::SelectingRemote,

[8.4637]

[8.4701]

                            model::PushOption::SelectingRemote { remote: None },

Replacement in inflorescence_model/src/action.rs at line 234 [12.3501]

B:BD[8.5048] → [8.5048:5187]

            model::SubMenu::Pull {
                remote: _,
                selecting_remote: _,
                opt,
            } => {

[8.5048]

[8.5187]

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

Replacement in inflorescence_model/src/action.rs at line 253 [12.3501]

B:BD[8.5966] → [8.5966:6030]

                            model::PullOption::SelectingRemote,

[8.5966]

[8.6030]

                            model::PullOption::SelectingRemote { remote: None },

Deletion in inflorescence_model/src/action.rs at line 787 [12.3501]
B:BD[7.7098] → [8.6060:6104]
```
                    selecting_remote: None,
```
Deletion in inflorescence_model/src/action.rs at line 803 [12.3501]
B:BD[8.6241] → [8.6241:6285]
```
                    selecting_remote: None,
```

Replacement in inflorescence/src/main.rs at line 1181 [13.2763]

B:BD[4.5957] → [8.7492:7631]

∅:D[8.7631] → [7.8121:8156]

B:BD[7.8121] → [7.8121:8156]

            Some(model::SubMenu::Push {
                remote,
                selecting_remote,
                opt,
            }) => {
                if opt.is_some() {

[4.5957]

[7.8156]

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

Replacement in inflorescence/src/main.rs at line 1185 [13.2763]

B:BD[7.8216] → [8.7632:7738]

                        remote: selecting_remote.clone(),
                        selecting_remote: None,

[7.8216]

[7.8264]

                        remote: remote.clone(),

Replacement in inflorescence/src/main.rs at line 1193 [13.2763]

B:BD[7.8486] → [8.7739:7913]

            Some(model::SubMenu::Pull {
                remote,
                selecting_remote,
                opt,
            }) => {
                if opt.is_some() {

[7.8486]

[8.7913]

            Some(model::SubMenu::Pull { remote, opt }) => {
                if let Some(model::PullOption::SelectingRemote { remote }) = opt
                {

Replacement in inflorescence/src/main.rs at line 1197 [13.2763]

B:BD[8.7973] → [8.7973:8079]

                        remote: selecting_remote.clone(),
                        selecting_remote: None,

[8.7973]

[8.8079]

                        remote: remote.clone(),

Replacement in inflorescence/src/main.rs at line 1343 [13.2763]

B:BD[7.8557] → [8.8352:8528]

                    model::SubMenu::Push {
                        remote,
                        selecting_remote: _,
                        opt,
                    } => {

[7.8557]

[7.8622]

                    model::SubMenu::Push { remote, opt } => {

Deletion in inflorescence/src/main.rs at line 1347 [13.2763]

B:BD[8.8569] → [8.8569:8625]

                                selecting_remote: None,

Replacement in inflorescence/src/main.rs at line 1352 [13.2763]

B:BD[8.8797] → [8.8797:8973]

                    model::SubMenu::Pull {
                        remote,
                        selecting_remote: _,
                        opt,
                    } => {

[8.8797]

[8.8973]

                    model::SubMenu::Pull { remote, opt } => {

Deletion in inflorescence/src/main.rs at line 1356 [13.2763]

B:BD[8.9124] → [8.9124:9180]

                                selecting_remote: None,

Deletion in inflorescence/src/main.rs at line 1402 [13.2763]
B:BD[8.9315] → [8.9315:9357]
```
                        selecting_remote,
```

Replacement in inflorescence/src/main.rs at line 1407 [13.2763]

B:BD[7.9596] → [7.9596:9660]

B:BD[7.9660] → [8.9358:9551]

                            return sub_menu_push_opt_selection(
                                msg,
                                selecting_remote,
                                opt,
                                repo,
                            );

[7.9596]

[8.9551]

                            return sub_menu_push_opt_selection(msg, opt, repo);

Deletion in inflorescence/src/main.rs at line 1412 [13.2763]
B:BD[8.9677] → [8.9677:9719]
```
                        selecting_remote,
```

Replacement in inflorescence/src/main.rs at line 1417 [13.2763]

B:BD[8.9930] → [8.9930:10156]

∅:D[8.10156] → [7.9716:9747]

B:BD[7.9716] → [7.9716:9747]

                            return sub_menu_pull_opt_selection(
                                msg,
                                selecting_remote,
                                opt,
                                repo,
                            );

[8.9930]

[7.9747]

                            return sub_menu_pull_opt_selection(msg, opt, repo);

Replacement in inflorescence/src/main.rs at line 1625 [13.2763]

B:BD[7.10232] → [7.10232:10293]

B:BD[7.10293] → [8.10208:10467]

        action::FilteredMsg::SubMenuPushOption(new_opt) => {
            if let Some(model::SubMenu::Push {
                opt,
                remote,
                selecting_remote,
            }) = sub_menu
            {
                match &new_opt {
                    model::PushOption::SelectingRemote => {

[7.10232]

[8.10467]

        action::FilteredMsg::SubMenuPushOption(mut new_opt) => {
            if let Some(model::SubMenu::Push { opt, remote }) = sub_menu {
                match &mut new_opt {
                    model::PushOption::SelectingRemote {
                        remote: selecting_remote,
                    } => {

Replacement in inflorescence/src/main.rs at line 1638 [13.2763]

B:BD[2.18195] → [8.10568:10888]

        action::FilteredMsg::SubMenuPullOption(new_opt) => {
            if let Some(model::SubMenu::Pull {
                opt,
                remote,
                selecting_remote,
            }) = sub_menu
            {
                match &new_opt {
                    model::PullOption::SelectingRemote => {

[2.18195]

[8.10888]

        action::FilteredMsg::SubMenuPullOption(mut new_opt) => {
            if let Some(model::SubMenu::Pull { opt, remote }) = sub_menu {
                match &mut new_opt {
                    model::PullOption::SelectingRemote {
                        remote: selecting_remote,
                    } => {

Deletion in inflorescence/src/main.rs at line 1808 [13.2763]
B:BD[7.10477] → [7.10477:10510]
```
    remote: &mut Option<String>,
```

Replacement in inflorescence/src/main.rs at line 1814 [13.2763]

B:BD[7.10725] → [8.11147:11195]

        model::PushOption::SelectingRemote => {

[7.10725]

[8.11195]

        model::PushOption::SelectingRemote { remote } => {

Deletion in inflorescence/src/main.rs at line 1822 [13.2763]
B:BD[8.11327] → [8.11327:11360]
```
    remote: &mut Option<String>,
```

Replacement in inflorescence/src/main.rs at line 1828 [13.2763]

B:BD[8.11582] → [8.11582:11630]

        model::PullOption::SelectingRemote => {

[8.11582]

[8.11630]

        model::PullOption::SelectingRemote { remote } => {