tzemanovic/inflorescence - Change KF2LDB5YIXMXBZK6KJWJOLJL66TN2KDXPH3NKEGGCQ5EVOZB77BQC

handle repo init errors

Created by Tomáš Zemanovič on September 12, 2025

KF2LDB5YIXMXBZK6KJWJOLJL66TN2KDXPH3NKEGGCQ5EVOZB77BQC

Dependencies

In channels

main

Change contents

Replacement in libflorescence/src/repo.rs at line 74 [21.7]
B:BD[15.583] → [15.583:623]
```
#[derive(Debug, Clone, strum::Display)]
```
[15.583]
[15.623]
```
#[derive(Debug, strum::Display)]
```
Insertion in libflorescence/src/repo.rs at line 77 [21.7]
[15.658]
[15.658]
```
    InitFailed(LoadError),
```
Replacement in libflorescence/src/repo.rs at line 192 [21.7]
B:BD[4.263] → [9.909:926]
```
#[derive(Debug)]
```
[3.252]
[9.926]
```
#[derive(Debug, Error)]
```

Replacement in libflorescence/src/repo.rs at line 194 [21.7]

B:BD[9.947] → [9.947:1016]

    DoesntExist,
    NotPijulRepo,
    Inaccessible(std::io::Error),

[9.947]

[9.1016]

    #[error("The path to repository {0:?} doesn't exit")]
    DoesntExist(String),
    #[error("The path {0:?} doesn't contain a Pijul repository")]
    NotPijulRepo(String),
    #[error("The path to repository {0:?} is not accessible: {1}")]
    Inaccessible(String, std::io::Error),

Replacement in libflorescence/src/repo.rs at line 220 [21.7]

B:BD[9.1441] → [9.1441:1541]

        Err(_err) => {
            // let _ = msg_out_tx.send(MsgOut::CannotLoad{err, msg_in_rx}));

[9.1441]

[9.1541]

        Err(err) => {
            let _ = msg_out_tx.send(MsgOut::InitFailed(err));

Replacement in libflorescence/src/repo.rs at line 229 [21.7]

B:BD[12.138] → [12.138:253]

        Ok(false) => return Err(LoadError::DoesntExist),
        Err(e) => return Err(LoadError::Inaccessible(e)),

[12.138]

[12.253]

        Ok(false) => {
            return Err(LoadError::DoesntExist(
                path.to_string_lossy().to_string(),
            ))
        }
        Err(e) => {
            return Err(LoadError::Inaccessible(
                path.to_string_lossy().to_string(),
                e,
            ))
        }

Replacement in libflorescence/src/repo.rs at line 241 [21.7]

B:BD[12.259] → [12.259:364]

    let repo = pijul::Repository::find_root(Some(path))
        .map_err(|_e| LoadError::NotPijulRepo)?;

[12.259]

[12.364]

    let repo = pijul::Repository::find_root(Some(path)).map_err(|_e| {
        LoadError::NotPijulRepo(path.to_string_lossy().to_string())
    })?;

Replacement in libflorescence/src/repo/test.rs at line 23 [9.1959]

B:BD[9.2350] → [9.2350:2422]

    assert_matches!(result.unwrap_err(), repo::LoadError::DoesntExist);

[9.2350]

[9.2422]

    assert_matches!(result.unwrap_err(), repo::LoadError::DoesntExist(_));

Replacement in libflorescence/src/repo/test.rs at line 31 [9.1959]

B:BD[9.2595] → [9.2595:2668]

    assert_matches!(result.unwrap_err(), repo::LoadError::NotPijulRepo);

[9.2595]

[10.284]

    assert_matches!(result.unwrap_err(), repo::LoadError::NotPijulRepo(_));

Replacement in libflorescence/src/repo/test.rs at line 47 [9.1959]

B:BD[9.3246] → [9.3246:3326]

        assert_matches!(result.unwrap_err(), repo::LoadError::Inaccessible(_));

[9.3246]

[9.3326]

        assert_matches!(
            result.unwrap_err(),
            repo::LoadError::Inaccessible(_, _)
        );

Insertion in justfile at line 44 [2.4]

[2.450]

[8.1052]

    cargo run --bin inflorescence-view-test-setup

Replacement in justfile at line 69 [2.4]

B:BD[5.141] → [5.141:200]

        cargo run --bin inflorescence-view-test-setup && \

[5.141]

[11.19]

        cargo run --bin inflorescence-view-test-setup

Replacement in inflorescence_view/src/view.rs at line 54 [22.12409]
B:BD[15.3942] → [19.176:226]
```
    // TODO: show report in load and other states
```
[15.3942]
[15.3942]
```
    // TODO: show report `SubState::SelectingId`
```

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

B:BD[15.3970] → [15.3970:4030]

        SubState::Loading { .. } => el(text("Loading...")),

[15.3970]

[15.4030]

        SubState::Loading { .. } => {
            let main = el(container(text("Loading..."))
                .width(Length::Fill)
                .height(Length::Fill));
            let actions_inner = column([]).spacing(4);
            let actions_inner =
                actions_inner.push(view_actions(allowed_actions));
            let actions = el(container(actions_inner)
                .class(theme::Container::ActionsBg)
                .width(Length::Fill)
                .height(Length::Shrink)
                .padding(Padding::from([2, 5])));
            let main = overlay_report(main, report, window_size);
            el(column([main, actions]))
        }

Replacement in inflorescence_view/src/view.rs at line 965 [22.12409]

B:BD[19.327] → [19.327:380]

    let main = report::view(report, main, |report| {

[19.327]

[19.380]

    let main = overlay_report(main, report, &window_size);
    el(column([main, actions]))
}
fn overlay_report<'a>(
    overlaid: Element<'a, Msg, Theme>,
    report: &'a report::Container,
    window_size: &iced::Size,
) -> Element<'a, Msg, Theme> {
    report::view(report, overlaid, |report| {

Replacement in inflorescence_view/src/view.rs at line 994 [22.12409]

B:BD[19.1009] → [19.1009:1211]

            el(
                container(column(report.entries.iter().map(view_report_entry)))
                    .padding([4, 6])
                    .class(theme::Container::Report),
            ),

[19.1009]

[19.1211]

            el(container(column(
                report.entries.iter().rev().map(view_report_entry),
            ))
            .padding([4, 6])
            .class(theme::Container::Report)),

Replacement in inflorescence_view/src/view.rs at line 1003 [22.12409]
B:BD[19.1332] → [19.1332:1340]
∅:D[19.1340] → [13.2241:2274]
∅:D[14.7502] → [13.2241:2274]
B:BD[13.2241] → [13.2241:2274]
```
    });
    el(column([main, actions]))
```
[19.1332]
[19.1341]
```
    })
```

Replacement in inflorescence/src/test.rs at line 972 [23.2521]

B:BD[8.5211] → [8.5211:5335]

        // Upate state with the msg received from task to init the repo
        let task = update(&mut state, msg.clone());

[8.5211]

[8.5335]

        let is_init = matches!(&msg, Msg::FromRepo(repo::MsgOut::Init(_))); // Upate state with the msg received from task to init the repo
        let task = update(&mut state, msg);

Replacement in inflorescence/src/test.rs at line 976 [23.2521]
B:BD[8.5336] → [8.5336:5402]
```
        if matches!(&msg, Msg::FromRepo(repo::MsgOut::Init(_))) {
```
[8.5336]
[8.5402]
```
        if is_init {
```
Replacement in inflorescence/src/main.rs at line 75 [2.2763]
B:BD[18.1925] → [18.1925:1949]
```
#[derive(Debug, Clone)]
```
[18.1925]
[18.1949]
```
#[derive(Debug)]
```

Replacement in inflorescence/src/main.rs at line 165 [2.2763]

B:BD[7.226] → [7.226:321]

B:BD[7.321] → [17.9799:9873]

∅:D[17.9873] → [7.389:451]

∅:D[15.81092] → [7.389:451]

B:BD[7.389] → [7.389:451]

            info!("Starting a new task to manage repo");
            let (task, repo_tx_in) =
                start_task_to_manage_repo(state.model.repo_path.clone());
            state.repo_tx_in = repo_tx_in;
            task

[7.226]

[16.24173]

            Task::none()

Insertion in inflorescence/src/main.rs at line 639 [2.2763]

[6.1008]

[15.86299]

        repo::MsgOut::InitFailed(err) => {
            report::show_err(&mut state.model.report, err.to_string());
            Task::none()
        }

Insertion in iced_expl_widget/src/report.rs at line 26 [19.7808]

[19.8399]

    /// Entries in insert order. For display use reverse iterator to start with
    /// most recent ones.

Replacement in iced_expl_widget/src/report.rs at line 310 [19.7808]
B:BD[20.1414] → [20.1414:1450]
```
    report.entries.iter().for_each(
```
[20.1414]
[20.1450]
```
    report.entries.iter().rev().for_each(
```

Insertion in iced_expl_widget/src/report.rs at line 325 [19.7808]

[20.1802]

}
pub fn show_err(report: &mut Container, msg: String) {
    report.hidden = false;
    report.entries.push(Entry {
        level: Level::Error,
        msg,
        time: Timestamp::now(),
        is_read: false,
    });