tzemanovic/inflorescence - Change SEJXDXPWV6XND6XIH5XZ3IK4CZDF3EJKLEXNIKOMPNHO5UKUVY3AC

improve file watcher to respect .ignore file

Created by tzemanovic on February 7, 2026

SEJXDXPWV6XND6XIH5XZ3IK4CZDF3EJKLEXNIKOMPNHO5UKUVY3AC

Dependencies

In channels

main

Change contents

Replacement in inflorescence/src/test.rs at line 116 [25.2521]

B:BD[11.2601] → [21.3594914:3595033]

        Msg::ManagingRepo(ManagingRepoMsg::ToRepo(
            repo::MsgIn::RefreshChangedAndUntrackedFiles
        ))

[11.2601]

[11.2705]

        Msg::ManagingRepo(ManagingRepoMsg::WatchedFileChange(
            path
        )) if path == &repo_path.join(file_to_record)

Replacement in inflorescence/src/test.rs at line 226 [25.2521]

B:BD[12.484] → [21.3595351:3595470]

        Msg::ManagingRepo(ManagingRepoMsg::ToRepo(
            repo::MsgIn::RefreshChangedAndUntrackedFiles
        ))

[12.484]

[12.588]

        Msg::ManagingRepo(ManagingRepoMsg::WatchedFileChange(
            path
        )) if path == &repo_path.join(file_to_record)

Replacement in inflorescence/src/test.rs at line 527 [25.2521]

B:BD[13.865] → [21.3595858:3595977]

        Msg::ManagingRepo(ManagingRepoMsg::ToRepo(
            repo::MsgIn::RefreshChangedAndUntrackedFiles
        ))

[13.865]

[13.969]

        Msg::ManagingRepo(ManagingRepoMsg::WatchedFileChange(
            path
        )) if path == &repo_path.join(file_to_record)

Replacement in inflorescence/src/main.rs at line 23 [2.2763]
∅:D[6.112] → [5.4438:4510]
∅:D[18.634] → [5.4438:4510]
∅:D[9.5322] → [5.4438:4510]
∅:D[8.25516] → [5.4438:4510]
B:BD[3.508] → [5.4438:4510]
```
use notify_debouncer_full::notify::{RecommendedWatcher, RecursiveMode};
```
[18.634]
[4.250]
```
use notify_debouncer_full::notify::{self, RecommendedWatcher, RecursiveMode};
```

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

B:BD[4.279] → [20.373:450]

    new_debouncer, notify, DebounceEventResult, Debouncer, RecommendedCache,

[4.279]

[4.348]

    new_debouncer, DebounceEventResult, Debouncer, RecommendedCache,

Insertion in inflorescence/src/main.rs at line 94 [2.2763]
[17.1897]
[19.5097]
```
    /// ".ignore" file loaded to memory
    ignore: Gitignore,
```
Insertion in inflorescence/src/main.rs at line 115 [2.2763]
[17.2135]
[2.2959]
```
    WatchedFileChange(PathBuf),
```
Replacement in inflorescence/src/main.rs at line 130 [2.2763]
B:BD[21.3609881] → [21.3609881:3609928]
```
    let report = report::Container::default();
```
[21.3609881]
[21.3609928]
```
    let mut report = report::Container::default();
```
Replacement in inflorescence/src/main.rs at line 134 [2.2763]
B:BD[21.3610025] → [21.3610025:3610068]
```
            init_managing_repo(repo_path);
```
[21.3610025]
[21.3610068]
```
            init_managing_repo(repo_path, &mut report);
```
Insertion in inflorescence/src/main.rs at line 212 [2.2763]
[21.3611437]
[21.3611437]
```
    report: &mut report::Container,
```

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

[7.965]

[21.3611699]

    // Load `.ignore` file
    let (ignore, ignore_err) = Gitignore::new(repo_path.join(".ignore"));
    if let Some(err) = ignore_err {
        let msg = format!("Error loading .ignore file {err:?}");
        error!("{msg}");
        report::show_err(report, msg);
    }

Insertion in inflorescence/src/main.rs at line 249 [2.2763]
[21.3611899]
[21.3611899]
```
        ignore,
```

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

B:BD[21.3612079] → [21.3612079:3612123]

B:BD[21.3612123] → [22.17443:17510]

                let (task, new_sub_state) =
                    update_picking_repo_dir_from_view(model, msg);

[21.3612079]

[21.3612186]

                let (task, new_sub_state) = update_picking_repo_dir_from_view(
                    model,
                    msg,
                    &mut state.model.report,
                );

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

B:BD[22.17626] → [22.17626:17692]

                    update_picking_project_from_view(model, msg);

[22.17626]

[22.17692]

                    update_picking_project_from_view(
                        model,
                        msg,
                        &mut state.model.report,
                    );

Insertion in inflorescence/src/main.rs at line 389 [2.2763]
[22.20556]
[22.20556]
```
    report: &mut report::Container,
```

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

B:BD[24.3481] → [24.3481:3543]

                            init_managing_repo(path.clone());

[24.3481]

[24.3543]

                            init_managing_repo(path.clone(), report);

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

B:BD[22.20861] → [22.20861:20902]

                init_managing_repo(dir);

[22.20861]

[22.20902]

                init_managing_repo(dir, report);

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

[22.21903]

        ManagingRepoMsg::WatchedFileChange(path) => {
            let is_dir = path.metadata().map(|md| md.is_dir()).unwrap_or(false);
            if !state
                .ignore
                .matched_path_or_any_parents(&path, is_dir)
                .is_ignore()
                && let Some(fs_watch) = state.repo_fs_watch.as_mut()
            {
                // Refresh repo
                state
                    .repo_tx_in
                    .send(repo::MsgIn::RefreshChangedAndUntrackedFiles)
                    .unwrap();
                // Start watching it in case it's a new file
                if let Err(err) =
                    fs_watch.watch(&path, RecursiveMode::NonRecursive)
                {
                    match &err.kind {
                        // Ignore path not found as this might be triggered on a
                        // watched file that's been removed
                        notify::ErrorKind::PathNotFound => {}
                        notify::ErrorKind::Generic(_)
                        | notify::ErrorKind::Io(_)
                        | notify::ErrorKind::WatchNotFound
                        | notify::ErrorKind::InvalidConfig(_)
                        | notify::ErrorKind::MaxFilesWatch => {
                            let msg = format!(
                    "Error setting up file watch for path {}: {err:?}",
                    path.to_string_lossy()
                );
                            error!("{msg}");
                            report::show_err(report, msg)
                        }
                    }
                }
            }
            Task::none()
        }

Insertion in inflorescence/src/main.rs at line 735 [2.2763]
[21.3615377]
[21.3615377]
```
    report: &mut report::Container,
```

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

B:BD[23.12210] → [23.12210:12251]

                init_managing_repo(dir);

[23.12210]

[23.12251]

                init_managing_repo(dir, report);

Deletion in inflorescence/src/main.rs at line 1845 [2.2763]
B:BD[10.8018] → [20.521:549]
B:BD[20.549] → [21.3624314:3624394]
∅:D[21.3624394] → [20.643:679]
B:BD[20.643] → [20.643:679]
B:BD[20.679] → [22.26557:26622]
∅:D[22.26622] → [20.742:767]
B:BD[20.742] → [20.742:767]
B:BD[20.767] → [21.3624395:3624434]
∅:D[21.3624434] → [20.823:829]
B:BD[20.823] → [20.823:829]
```
    // Load `.ignore` file
    let (ignore, ignore_err) = Gitignore::new(model.repo_path.join(".ignore"));
    if let Some(err) = ignore_err {
        let msg = format!("Error loading .ignore file {err:?}");
        error!("{msg}");
        report::show_err(report, msg);
    }
```

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

B:BD[10.8068] → [10.8068:8125]

    let (fs_watch_tx, fs_watch_rx) = watch::channel(());

[10.8068]

[10.8125]

    let (fs_watch_tx, fs_watch_rx) = watch::channel(model.repo_path.clone());

Deletion in inflorescence/src/main.rs at line 1853 [2.2763]
B:BD[10.8326] → [10.8326:8380]
```
                // TODO: distinguish ".pijul" changes
```

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

B:BD[10.8564] → [20.830:1490]

                    let is_dir = matches!(
                        event.kind,
                        notify::EventKind::Create(
                            notify::event::CreateKind::Folder,
                        ) | notify::EventKind::Remove(
                            notify::event::RemoveKind::Folder,
                        )
                    );
                    if event.paths.iter().any(|path| {
                        !ignore
                            .matched_path_or_any_parents(path, is_dir)
                            .is_ignore()
                    }) {
                        let _ = fs_watch_tx.send(());
                    }

[10.8564]

[10.8614]

                    event.paths.iter().for_each(|path| {
                        let _ = fs_watch_tx.send(path.clone());
                    })

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

B:BD[10.8794] → [10.8794:8807]

B:BD[10.8807] → [21.3624435:3624494]

∅:D[16.14517] → [10.8866:8885]

∅:D[14.91804] → [10.8866:8885]

∅:D[21.3624494] → [10.8866:8885]

B:BD[10.8866] → [10.8866:8885]

    fs_watch
        .watch(&model.repo_path, RecursiveMode::Recursive)
        .unwrap();

[10.8794]

[10.8885]


    for entry in ignore::WalkBuilder::new(&model.repo_path)
        .standard_filters(false) // disable git related stuff
        .ignore(true) // use ".ignore" file
        .build()
        // ignore errors
        .flatten()
    {
        if let Err(err) =
            fs_watch.watch(entry.path(), RecursiveMode::NonRecursive)
        {
            let msg = format!(
                "Error setting up file watch for path {}: {err:?}",
                entry.path().to_string_lossy()
            );
            error!("{msg}");
            report::show_err(report, msg)
        }
    }

Replacement in inflorescence/src/main.rs at line 1889 [2.2763]
B:BD[10.8947] → [10.8947:8998]
B:BD[10.8998] → [21.3624495:3624573]
∅:D[15.26723] → [10.9103:9111]
∅:D[21.3624573] → [10.9103:9111]
B:BD[10.9103] → [10.9103:9111]
```
    let watch_task = Task::run(fs_watch_rx, |()| {
        ManagingRepoMsg::ToRepo(repo::MsgIn::RefreshChangedAndUntrackedFiles)
    });
```
[10.8947]
[10.9111]
```
    let watch_task = Task::run(fs_watch_rx, ManagingRepoMsg::WatchedFileChange);
```

improve file watcher to respect .ignore file

Dependencies

In channels

Change contents

Replacement in inflorescence/src/test.rs at line 116 [25.2521]

Replacement in inflorescence/src/test.rs at line 226 [25.2521]

Replacement in inflorescence/src/test.rs at line 527 [25.2521]

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

Deletion in inflorescence/src/main.rs at line 1845 [2.2763]

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

Deletion in inflorescence/src/main.rs at line 1853 [2.2763]

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

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

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