tzemanovic/inflorescence - Change TQEZQJV4G4OXAYDLTMJW3NCRQV6W7I3MUBOKNCSOSXCSVLABW4QQC

finish other channels logs selection

Created by Tomáš Zemanovič on August 13, 2025

TQEZQJV4G4OXAYDLTMJW3NCRQV6W7I3MUBOKNCSOSXCSVLABW4QQC

Dependencies

In channels

main

Change contents

Replacement in inflorescence_view/src/app.rs at line 510 [9.12409]

B:BD[8.5344] → [8.5344:5405]

                .on_press(Msg::Action(action::Msg::Confirm))

[8.5344]

[8.5405]

                .on_press(Msg::Action(action::Msg::Selection(selection::Msg::Select(selection::Select::Channel { ix, name: channel.clone() }))))

Replacement in inflorescence_view/src/app.rs at line 567 [9.12409]

B:BD[8.7436] → [8.7436:7507]

                el(nav_scrollable(&navigation.entire_log_nav, entries)

[8.7436]

[8.7507]

                el(nav_scrollable(&navigation.other_channel_log_nav, entries)

Insertion in inflorescence_model/src/selection.rs at line 102 [2.3124]
[2.4435]
[2.4435]
```
    },
    Channel {
        ix: usize,
        name: String,
```

Insertion in inflorescence_model/src/lib.rs at line 84 [7.31726]

[7.33559]

[8.18010]

    /// Other channel log change selection's nav
    pub other_channel_log_nav: nav_scrollable::State,
    /// Selected channel's name

Insertion in inflorescence_model/src/lib.rs at line 120 [7.31726]
[8.18202]
[8.18202]
```
    navigation.other_channel_log_nav = nav_scrollable::State::default();
```

Replacement in inflorescence/src/selection.rs at line 315 [10.26]

B:BD[7.44479] → [8.30682:30748]

            let ix = if ix == ctx.repo.other_channels.len() - 1 {

[7.44479]

[7.44536]

            let ix = if ix == ctx.repo.other_channels.len().saturating_sub(1) {

Replacement in inflorescence/src/selection.rs at line 363 [10.26]

B:BD[8.32011] → [8.32011:32087]

                            &mut ctx.navigation.entire_logs_navs.diffs_nav,

[8.32011]

[8.32087]

                            &mut ctx
                                .navigation
                                .other_channel_logs_navs
                                .diffs_nav,

Replacement in inflorescence/src/selection.rs at line 372 [10.26]

B:BD[6.24227] → [8.32151:32221]

                        let log_entry = log.get(channel_ix).unwrap();

[6.24227]

[6.24293]

                        let log_entry = log.get(change_ix).unwrap();

Insertion in inflorescence/src/selection.rs at line 412 [10.26]
[8.33132]
[8.33132]

Replacement in inflorescence/src/selection.rs at line 523 [10.26]

B:BD[7.46447] → [7.46447:46499]

        Primary::Channel => select_up_channel(ctx),

[7.46447]

[7.46499]

        Primary::Channel => select_up_channel(ctx, delta),

Replacement in inflorescence/src/selection.rs at line 709 [10.26]

B:BD[4.4174] → [7.50490:50598]

fn select_up_channel(ctx: &mut Ctx<'_>) -> Task<crate::Msg> {
    let ix = match ctx.state.channel.take() {

[4.4174]

[7.50598]

fn select_up_channel(
    ctx: &mut Ctx<'_>,
    delta: Option<Duration>,
) -> Task<crate::Msg> {
    let (selection, task) = match ctx.state.channel.take() {

Replacement in inflorescence/src/selection.rs at line 717 [10.26]
B:BD[7.50658] → [7.50658:50678]
```
            log: _,
```
[7.50658]
[7.50678]
```
            log: None,
```

Replacement in inflorescence/src/selection.rs at line 719 [10.26]

B:BD[7.50694] → [7.50694:50769]

            if ix == 0 {
                ctx.repo.other_channels.len() - 1

[7.50694]

[7.50769]

            let ix = if ix == 0 {
                ctx.repo.other_channels.len().saturating_sub(1)

Insertion in inflorescence/src/selection.rs at line 723 [10.26]

[7.50813]

            };
            channel_selection(ix, VDir::Up, ctx)
        }
        None => {
            let ix = ctx.repo.other_channels.len().saturating_sub(1);
            channel_selection(ix, VDir::Up, ctx)
        }
        Some(Channel {
            ix: channel_ix,
            name,
            log:
                Some(LogChange {
                    ix: change_ix,
                    hash,
                    message,
                    file,
                }),
        }) => {
            if let Some(Log::Loaded { log }) =
                ctx.logs.other_channels_logs.get(&name)
            {
                if let Some(LogChangeFileSelection {
                    ix: file_ix,
                    path,
                    diff_selected,
                }) = file
                {
                    if diff_selected {
                        let selection = Channel {
                            ix: channel_ix,
                            name,
                            log: Some(LogChange {
                                ix: change_ix,
                                hash,
                                message,
                                file: Some(LogChangeFileSelection {
                                    ix: file_ix,
                                    path,
                                    diff_selected,
                                }),
                            }),
                        };
                        nav_scrollable::scroll_up(
                            &mut ctx
                                .navigation
                                .other_channel_logs_navs
                                .diffs_nav,
                            delta,
                        );
                        (selection, Task::none())
                    } else {
                        let log_entry = log.get(change_ix).unwrap();
                        let file_ix = if 0 == file_ix {
                            log_entry.file_paths.len().saturating_sub(1)
                        } else {
                            file_ix - 1
                        };
                        let (file, selection_task) = channel_log_file_selection(
                            file_ix,
                            hash,
                            VDir::Up,
                            ctx.navigation,
                            log_entry,
                        );
                        let selection = Channel {
                            ix: channel_ix,
                            name,
                            log: Some(LogChange {
                                ix: change_ix,
                                hash,
                                message,
                                file: Some(file),
                            }),
                        };
                        (selection, selection_task)
                    }
                } else {
                    let (selection, task) = if 0 == change_ix {
                        let ix = log.len().saturating_sub(1);
                        channel_log_selection(ix, VDir::Down, ctx, log)
                    } else {
                        let ix = change_ix - 1;
                        channel_log_selection(ix, VDir::Up, ctx, log)
                    };
                    let selection = Channel {
                        ix: channel_ix,
                        name,
                        log: Some(selection),
                    };
                    (selection, task)
                }
            } else {
                let selection = Channel {
                    ix: channel_ix,
                    name,
                    log: Some(LogChange {
                        ix: change_ix,
                        hash,
                        message,
                        file,
                    }),
                };
                (selection, Task::none())

Deletion in inflorescence/src/selection.rs at line 834 [10.26]
B:BD[7.50837] → [7.50837:50888]
```
        None => ctx.repo.other_channels.len() - 1,
```
Deletion in inflorescence/src/selection.rs at line 835 [10.26]
B:BD[7.50895] → [7.50895:50961]
```
    let (selection, task) = channel_selection(ix, VDir::Up, ctx);
```
Insertion in inflorescence/src/selection.rs at line 1674 [10.26]
[7.72796]
[3.46480]
```
                Select::Channel { .. } => unreachable!(),
```

Replacement in inflorescence/src/selection.rs at line 1680 [10.26]

B:BD[7.72895] → [7.72895:72915]

            // TODO

[7.72895]

[5.926]

            let (selection, task) = match select {
                Select::Channel { ix, name: _ } => {
                    let (selection, task) =
                        channel_selection(ix, VDir::Down, ctx);
                    (Some(selection), task)
                }
                Select::LogChange {
                    ix,
                    hash: _,
                    message: _,
                } => match ctx.state.channel.take() {
                    Some(Channel {
                        ix: channel_ix,
                        name,
                        log,
                    }) => {
                        if let Some(Log::Loaded { log }) =
                            ctx.logs.other_channels_logs.get(&name)
                        {
                            let (selection, task) =
                                channel_log_selection(ix, VDir::Down, ctx, log);
                            (
                                Some(Channel {
                                    ix: channel_ix,
                                    name,
                                    log: Some(selection),
                                }),
                                task,
                            )
                        } else {
                            (
                                Some(Channel {
                                    ix: channel_ix,
                                    name,
                                    log,
                                }),
                                Task::none(),
                            )
                        }
                    }
                    selection => (selection, Task::none()),
                },
                Select::LogChangeFile { ix, path: _ } => {
                    match ctx.state.channel.take() {
                        Some(Channel {
                            ix: channel_ix,
                            name,
                            log:
                                Some(LogChange {
                                    ix: change_ix,
                                    hash,
                                    message,
                                    file,
                                }),
                        }) => {
                            if let Some(Log::Loaded { log }) =
                                ctx.logs.other_channels_logs.get(&name)
                                && let Some(log_entry) = log.get(change_ix)
                            {
                                let (selection, task) =
                                    channel_log_file_selection(
                                        ix,
                                        hash,
                                        VDir::Down,
                                        ctx.navigation,
                                        log_entry,
                                    );
                                (
                                    Some(Channel {
                                        ix: channel_ix,
                                        name,
                                        log: Some(LogChange {
                                            ix: change_ix,
                                            hash,
                                            message,
                                            file: Some(selection),
                                        }),
                                    }),
                                    task,
                                )
                            } else {
                                (
                                    Some(Channel {
                                        ix: channel_ix,
                                        name,
                                        log: Some(LogChange {
                                            ix: change_ix,
                                            hash,
                                            message,
                                            file,
                                        }),
                                    }),
                                    Task::none(),
                                )
                            }
                        }
                        selection => (selection, Task::none()),
                    }
                }
                Select::UntrackedFile { .. } | Select::ChangedFile { .. } => {
                    unreachable!()
                }
            };
            ctx.state.channel = selection;
            return task;

Replacement in inflorescence/src/selection.rs at line 1829 [10.26]

B:BD[7.74727] → [7.74727:74815]

                    _ => {
                        unreachable!()
                    }

[7.74727]

[7.74815]

                    Select::UntrackedFile { .. }
                    | Select::ChangedFile { .. }
                    | Select::Channel { .. } => unreachable!(),

Replacement in inflorescence/src/selection.rs at line 2140 [10.26]

B:BD[7.77227] → [8.56920:56968]

            &mut navigation.other_channels_nav,

[7.77227]

[8.56968]

            &mut navigation.other_channel_log_nav,

Replacement in inflorescence/src/selection.rs at line 2144 [10.26]

B:BD[7.77330] → [8.56985:57033]

            &mut navigation.other_channels_nav,

[7.77330]

[8.57033]

            &mut navigation.other_channel_log_nav,