tzemanovic/inflorescence - Change TEDT26JQBWGATVTY6HZTIOGFR6BXW2BHSUKUTXTA7HOXARRQ5D6AC

add push and pull sub-menus

Created by tzemanovic on January 28, 2026

TEDT26JQBWGATVTY6HZTIOGFR6BXW2BHSUKUTXTA7HOXARRQ5D6AC

Dependencies

In channels

main

Change contents

Insertion in inflorescence_view/src/view.rs at line 56 [22.12409]
[10.487]
[14.159]
```
        sub_menu: _,
```
Replacement in inflorescence_view/src/view/test.rs at line 5 [3.4223]
∅:D[14.2347] → [12.3236:3299]
B:BD[3.4320] → [12.3236:3299]
```
use inflorescence_model::model::{ReadyState, State, SubState};
```
[14.2347]
[21.25]
```
use inflorescence_model::model::{ReadyState, State, SubMenu, SubState};
```

Replacement in inflorescence_view/src/view/test.rs at line 51 [3.4223]

B:BD[21.206] → [21.206:268]

    let allowed_actions = action::get_allowed(&sub, &report);

[21.206]

[3.4726]

    let allowed_actions = action::get_allowed(&sub, &None, &report);

Insertion in inflorescence_view/src/view/test.rs at line 59 [3.4223]
[21.307]
[21.307]
```
        sub_menu: None,
```

Replacement in inflorescence_view/src/view/test.rs at line 90 [3.4223]

B:BD[21.415] → [21.415:477]

    let allowed_actions = action::get_allowed(&sub, &report);

[21.415]

[4.104]

    let allowed_actions = action::get_allowed(&sub, &None, &report);

Insertion in inflorescence_view/src/view/test.rs at line 97 [3.4223]
[21.516]
[21.516]
```
        sub_menu: None,
```

Replacement in inflorescence_view/src/view/test.rs at line 143 [3.4223]

B:BD[21.624] → [21.624:686]

    let allowed_actions = action::get_allowed(&sub, &report);

[21.624]

[5.8275]

    let allowed_actions = action::get_allowed(&sub, &None, &report);

Insertion in inflorescence_view/src/view/test.rs at line 150 [3.4223]
[21.725]
[21.725]
```
        sub_menu: None,
```

Replacement in inflorescence_view/src/view/test.rs at line 190 [3.4223]

B:BD[21.833] → [21.833:895]

    let allowed_actions = action::get_allowed(&sub, &report);

[21.833]

[3.5637]

    let allowed_actions = action::get_allowed(&sub, &None, &report);

Insertion in inflorescence_view/src/view/test.rs at line 197 [3.4223]
[21.934]
[21.934]
```
        sub_menu: None,
```

Replacement in inflorescence_view/src/view/test.rs at line 256 [3.4223]

B:BD[21.1063] → [21.1063:1125]

    let allowed_actions = action::get_allowed(&sub, &report);

[21.1063]

[21.1125]

    let allowed_actions = action::get_allowed(&sub, &None, &report);
    let state = State {
        window_size: WINDOW_SIZE,
        window_scale: WINDOW_SCALE,
        repo_path: repo_path.clone(),
        sub,
        allowed_actions,
        sub_menu: None,
        report,
    };
    test_view(mresults, uniq_name, view(&state), size);
    // _________________________________________________________________________
    //
    let uniq_name = "sub_menu_push";
    let repo = repo::State {
        dir_name: "path".to_string(),
        channel: "some_channel".to_string(),
        other_channels: vec![],
        untracked_files: BTreeSet::new(),
        changed_files: BTreeMap::new(),
        short_log: vec![],
    };
    let ready_state = ReadyState {
        user_id: Id::default().unwrap(),
        repo,
        selection: default(),
        navigation: default(),
        record_changes: default(),
        logs: default(),
        forking_channel_name: default(),
        to_record: default(),
        jobs: default(),
    };
    let repo_path = PathBuf::from("test/repo/path");
    let sub = SubState::Ready(ready_state);
    let report = report::Container::default();
    let sub_menu = Some(SubMenu::Push);
    let allowed_actions = action::get_allowed(&sub, &sub_menu, &report);

Insertion in inflorescence_view/src/view/test.rs at line 303 [3.4223]
[21.1295]
[21.1295]
```
        sub_menu,
```
File addition: sub_menu_push-wgpu.png (----------)
[20.1]
Insertion in inflorescence_model/src/model.rs at line 36 [12.3550]
[12.4335]
[14.6619]
```
    pub sub_menu: Option<SubMenu>,
```

Insertion in inflorescence_model/src/model.rs at line 40 [12.3550]

[12.4338]

#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub enum SubMenu {
    Push,
    Pull,
}

Replacement in inflorescence_model/src/action.rs at line 40 [10.3501]
B:BD[16.15390] → [17.4810:4820]
B:BD[17.4820] → [18.9646:9656]
```
    Push,
    Pull,
```
[16.15390]
[10.4320]
```
    EnterSubMenu(model::SubMenu),
```
Replacement in inflorescence_model/src/action.rs at line 102 [10.3501]
B:BD[15.13523] → [17.4821:4851]
B:BD[17.4851] → [18.9657:9687]
```
        (Push, Push) => true,
        (Pull, Pull) => true,
```
[15.13523]
[10.5127]
```
        (EnterSubMenu(left), EnterSubMenu(right)) => left == right,
```
Replacement in inflorescence_model/src/action.rs at line 123 [10.3501]
B:BD[16.15948] → [17.4852:4880]
B:BD[17.4880] → [18.9688:9716]
```
        (Push, _) => false,
        (Pull, _) => false,
```
[16.15948]
[10.5587]
```
        (EnterSubMenu(_), _) => false,
```
Insertion in inflorescence_model/src/action.rs at line 129 [10.3501]
[14.6884]
[14.6884]
```
    sub_menu: &Option<model::SubMenu>,
```

Replacement in inflorescence_model/src/action.rs at line 132 [10.3501]

B:BD[14.6936] → [14.6936:6973]

∅:D[14.6973] → [10.5676:5862]

B:BD[10.5676] → [10.5676:5862]

    let mut bindings = match state {
        model::SubState::Loading { .. } => vec![],
        model::SubState::SelectingId { .. } => todo!(),
        model::SubState::Ready(ready_state) => get_ready_allowed(ready_state),

[14.6936]

[14.6974]

    let mut bindings = if let Some(sub_menu) = sub_menu {
        match sub_menu {
            model::SubMenu::Push => {
                // TODO add options
                vec![confirm("confirm push"), cancel()]
            }
            model::SubMenu::Pull => {
                // TODO add options
                vec![confirm("confirm pull"), cancel()]
            }
        }
    } else {
        match state {
            model::SubState::Loading { .. } => vec![],
            model::SubState::SelectingId { .. } => todo!(),
            model::SubState::Ready(ready_state) => {
                get_ready_allowed(ready_state)
            }
        }

Deletion in inflorescence_model/src/action.rs at line 284 [10.3501]
B:BD[10.8320] → [10.8320:8407]
B:BD[10.8407] → [12.8403:8444]
∅:D[12.8444] → [10.8440:8447]
B:BD[10.8440] → [10.8440:8447]
```
    let confirm = |label: &'static str| Binding {
        key: "Enter",
        label,
        msg: Some(FilteredMsg::Confirm),
    };
```
Deletion in inflorescence_model/src/action.rs at line 289 [10.3501]
B:BD[10.8565] → [10.8565:8640]
B:BD[10.8640] → [12.8445:8485]
∅:D[12.8485] → [10.8672:8679]
B:BD[10.8672] → [10.8672:8679]
```
    let cancel = || Binding {
        key: "Esc",
        label: "cancel",
        msg: Some(FilteredMsg::Cancel),
    };
```

Replacement in inflorescence_model/src/action.rs at line 348 [10.3501]

B:BD[17.4950] → [19.5860:5912]

        msg: can_push.then_some(FilteredMsg::Push),

[17.4950]

[17.4988]

        msg: can_push
            .then_some(FilteredMsg::EnterSubMenu(model::SubMenu::Push)),

Replacement in inflorescence_model/src/action.rs at line 354 [10.3501]

B:BD[18.9786] → [19.5976:6028]

        msg: can_pull.then_some(FilteredMsg::Pull),

[18.9786]

[18.9824]

        msg: can_pull
            .then_some(FilteredMsg::EnterSubMenu(model::SubMenu::Pull)),

Insertion in inflorescence_model/src/action.rs at line 580 [10.3501]

[10.13330]

// ____________________________________________________________________________
// Simplified state used for determining allowed bindings

Insertion in inflorescence_model/src/action.rs at line 947 [10.3501]

[10.23202]


// ____________________________________________________________________________
// Bindings
fn confirm(label: &'static str) -> Binding {
    Binding {
        key: "Enter",
        label,
        msg: Some(FilteredMsg::Confirm),
    }
}
fn cancel() -> Binding {
    Binding {
        key: "Esc",
        label: "cancel",
        msg: Some(FilteredMsg::Cancel),
    }
}

Insertion in inflorescence/src/main.rs at line 124 [23.2763]
[10.23774]
[14.7334]
```
        sub_menu: None,
```

Replacement in inflorescence/src/main.rs at line 182 [23.2763]

B:BD[10.24296] → [14.7381:7483]

    state.model.allowed_actions =
        action::get_allowed(&state.model.sub, &state.model.report);

[10.24296]

[10.24365]

    state.model.allowed_actions = action::get_allowed(
        &state.model.sub,
        &state.model.sub_menu,
        &state.model.report,
    );

Replacement in inflorescence/src/main.rs at line 344 [23.2763]

∅:D[12.12794] → [9.82966:83003]

∅:D[10.25605] → [9.82966:83003]

B:BD[7.18123] → [9.82966:83003]

            if let Some(ReadyState {

[12.12794]

[9.83003]

            if let Some(sub_menu) = &state.model.sub_menu {
                match sub_menu {
                    model::SubMenu::Push => push(state),
                    model::SubMenu::Pull => pull(state),
                }
            } else if let Some(ReadyState {

Insertion in inflorescence/src/main.rs at line 391 [23.2763]

[8.6809]

[7.18549]

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

Deletion in inflorescence/src/main.rs at line 395 [23.2763]
B:BD[7.18563] → [7.18563:18588]
```
            Task::none()
```

Replacement in inflorescence/src/main.rs at line 397 [23.2763]

∅:D[12.12836] → [9.83858:83895]

∅:D[10.25639] → [9.83858:83895]

B:BD[7.18628] → [9.83858:83895]

            if let Some(ReadyState {

[12.12836]

[9.83895]

            if state.model.sub_menu.is_some() {
                state.model.sub_menu = None;
            } else if let Some(ReadyState {

Replacement in inflorescence/src/main.rs at line 570 [23.2763]

B:BD[17.5576] → [17.5576:5615]

B:BD[17.5615] → [19.6913:7379]

        action::FilteredMsg::Push => {
            if let Some(ReadyState { repo, jobs, .. }) =
                model::is_ready_mut(&mut state.model)
            {
                jobs.insert(model::Job::Push {
                    channel: repo.channel.clone(),
                });
                state
                    .repo_tx_in
                    .send(repo::MsgIn::Push {
                        channel: repo.channel.clone(),
                    })
                    .unwrap();
            }

[17.5576]

[15.18160]

        action::FilteredMsg::EnterSubMenu(sub_menu) => {
            state.model.sub_menu = Some(sub_menu);

Deletion in inflorescence/src/main.rs at line 574 [23.2763]

B:BD[15.18195] → [18.9937:9976]

B:BD[18.9976] → [19.7380:7846]

∅:D[19.7846] → [18.10106:10141]

B:BD[18.10106] → [18.10106:10141]

        action::FilteredMsg::Pull => {
            if let Some(ReadyState { repo, jobs, .. }) =
                model::is_ready_mut(&mut state.model)
            {
                jobs.insert(model::Job::Pull {
                    channel: repo.channel.clone(),
                });
                state
                    .repo_tx_in
                    .send(repo::MsgIn::Pull {
                        channel: repo.channel.clone(),
                    })
                    .unwrap();
            }
            Task::none()
        }

Insertion in inflorescence/src/main.rs at line 687 [23.2763]

[11.64717]

[13.2206]

}
fn push(state: &mut State) -> Task<Msg> {
    if let Some(ReadyState { repo, jobs, .. }) =
        model::is_ready_mut(&mut state.model)
    {
        jobs.insert(model::Job::Push {
            channel: repo.channel.clone(),
        });
        state
            .repo_tx_in
            .send(repo::MsgIn::Push {
                channel: repo.channel.clone(),
            })
            .unwrap();
    }
    state.model.sub_menu = None;
    Task::none()

Insertion in inflorescence/src/main.rs at line 707 [23.2763]

[13.2209]

fn pull(state: &mut State) -> Task<Msg> {
    if let Some(ReadyState { repo, jobs, .. }) =
        model::is_ready_mut(&mut state.model)
    {
        jobs.insert(model::Job::Pull {
            channel: repo.channel.clone(),
        });
        state
            .repo_tx_in
            .send(repo::MsgIn::Pull {
                channel: repo.channel.clone(),
            })
            .unwrap();
    }
    state.model.sub_menu = None;
    Task::none()
}

Replacement in inflorescence/src/main.rs at line 1693 [23.2763]

B:BD[2.2363] → [18.10308:10445]

                    "f" if mods == Modifiers::SHIFT => {
                        action(action::FilteredMsg::Pull)
                    }

[6.128]

[10.29022]

                    "f" if mods == Modifiers::SHIFT => action(
                        action::FilteredMsg::EnterSubMenu(model::SubMenu::Pull),
                    ),

Replacement in inflorescence/src/main.rs at line 1708 [23.2763]

B:BD[10.29677] → [17.6027:6164]

                    "p" if mods == Modifiers::SHIFT => {
                        action(action::FilteredMsg::Push)
                    }

[10.29677]

[15.18398]

                    "p" if mods == Modifiers::SHIFT => action(
                        action::FilteredMsg::EnterSubMenu(model::SubMenu::Push),
                    ),

add push and pull sub-menus

Dependencies

In channels

Change contents

Insertion in inflorescence_view/src/view.rs at line 56 [22.12409]

Replacement in inflorescence_view/src/view/test.rs at line 5 [3.4223]

Replacement in inflorescence_view/src/view/test.rs at line 51 [3.4223]

Insertion in inflorescence_view/src/view/test.rs at line 59 [3.4223]

Replacement in inflorescence_view/src/view/test.rs at line 90 [3.4223]

Insertion in inflorescence_view/src/view/test.rs at line 97 [3.4223]

Replacement in inflorescence_view/src/view/test.rs at line 143 [3.4223]

Insertion in inflorescence_view/src/view/test.rs at line 150 [3.4223]

Replacement in inflorescence_view/src/view/test.rs at line 190 [3.4223]

Insertion in inflorescence_view/src/view/test.rs at line 197 [3.4223]

Replacement in inflorescence_view/src/view/test.rs at line 256 [3.4223]

Insertion in inflorescence_view/src/view/test.rs at line 303 [3.4223]

File addition: sub_menu_push-wgpu.png (----------)

Insertion in inflorescence_model/src/model.rs at line 36 [12.3550]

Insertion in inflorescence_model/src/model.rs at line 40 [12.3550]

Replacement in inflorescence_model/src/action.rs at line 40 [10.3501]

Replacement in inflorescence_model/src/action.rs at line 102 [10.3501]

Replacement in inflorescence_model/src/action.rs at line 123 [10.3501]

Insertion in inflorescence_model/src/action.rs at line 129 [10.3501]