tzemanovic/inflorescence - Change 6E6MSENZAZE7RGL4QBQD3MIAURXE5R3HINFWTNLOASJYVNHVOUMAC

allow to add untracked files recursively

Created by tzemanovic on March 6, 2026

6E6MSENZAZE7RGL4QBQD3MIAURXE5R3HINFWTNLOASJYVNHVOUMAC

Dependencies

In channels

main

Change contents

Replacement in libflorescence/src/testing.rs at line 79 [20.5]

B:BD[5.671] → [11.5:61]

    repo::add(&mut repo, DEFAULT_IGNORE_FILE).unwrap();

[5.671]

[5.749]

    let recursive = false;
    repo::add(&mut repo, DEFAULT_IGNORE_FILE, recursive).unwrap();

Insertion in libflorescence/src/repo.rs at line 65 [21.7]
[7.262]
[7.262]
```
        recursive: bool,
```

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

B:BD[3.2396] → [3.2396:2442]

        MsgIn::AddUntrackedFile { path } => {

[3.2396]

[4.182]

        MsgIn::AddUntrackedFile { path, recursive } => {

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

B:BD[11.968] → [11.968:1036]

                let result = add(&mut internal_state, &path_clone);

[11.968]

[11.1036]

                let result = add(&mut internal_state, &path_clone, recursive);

Insertion in libflorescence/src/repo.rs at line 938 [21.7]
[11.6917]
[11.6917]
```
    recursive: bool,
```

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

B:BD[2.1191] → [2.1191:1197]

[2.1191]

[2.1197]

    if recursive {
        let threads = std::thread::available_parallelism()?.get();
        use libpijul::working_copy::filesystem::*;
        let (full, _) = get_prefix(Some(repo_path.as_ref()), path.as_path())?;
        let full = CanonicalPathBuf::new(&full)?;
        repo.working_copy.add_prefix_rec(
            &txn,
            repo_path.clone(),
            full.clone(),
            false,
            threads,
            0,
        )?
    } else {

Replacement in libflorescence/src/repo/test.rs at line 208 [22.1959]

B:BD[6.406] → [11.10967:11021]

    repo::add(&mut internal.repo, new_file).unwrap();

[6.406]

[6.451]

    let recursive = false;
    repo::add(&mut internal.repo, new_file, recursive).unwrap();

Insertion in libflorescence/src/repo/test.rs at line 222 [22.1959]

[6.777]

[5.3687]


    // Create a dir with a file inside it
    let new_dir = "a";
    std::fs::create_dir(repo_path.join(new_dir)).unwrap();
    let new_file = "new_file";
    std::fs::write(repo_path.join(new_dir).join(new_file), "some content")
        .unwrap();
    let recursive = true;
    repo::add(&mut internal.repo, new_dir, recursive).unwrap();
    let diff = repo::get_diff(&internal.repo).unwrap();
    assert_eq!(diff.changes.len(), 2);

Insertion in inflorescence_model/src/model.rs at line 89 [10.3550]
[19.30513]
[13.531968]
```
    Add { recursive: bool },
```
Replacement in inflorescence_model/src/action.rs at line 40 [8.3501]
B:BD[8.4147] → [8.4147:4169]
```
    AddUntrackedFile,
```
[8.4147]
[14.1834]
```
    ToggleRecursive,
```

Replacement in inflorescence_model/src/action.rs at line 86 [8.3501]

B:BD[8.4801] → [8.4801:4855]

        (AddUntrackedFile, AddUntrackedFile) => true,

[8.4801]

[14.1849]

        (ToggleRecursive, ToggleRecursive) => true,

Replacement in inflorescence_model/src/action.rs at line 126 [8.3501]
B:BD[8.5333] → [8.5333:5373]
```
        (AddUntrackedFile, _) => false,
```
[8.5333]
[14.1888]
```
        (ToggleRecursive, _) => false,
```

Insertion in inflorescence_model/src/action.rs at line 238 [8.3501]

[18.1318]

[13.532531]

            model::SubMenu::Add { recursive } => {
                vec![
                    confirm("confirm add"),
                    toggle_recursive(*recursive),
                    cancel(),
                ]
            }

Replacement in inflorescence_model/src/action.rs at line 511 [8.3501]

B:BD[8.7214] → [10.7978:8028]

        msg: Some(FilteredMsg::AddUntrackedFile),

[8.7214]

[14.2048]

        msg: Some(FilteredMsg::EnterSubMenu(model::SubMenu::Add {
            recursive: false,
        })),

Insertion in inflorescence_model/src/action.rs at line 1437 [8.3501]

[13.533388]

fn toggle_recursive(is_recursive: bool) -> Binding {
    Binding {
        keys_str: "r",
        keys: ModKeys::One(ModKey {
            key: Key::Character("r".into()),
            mods: Mods::NONE,
        }),
        label: if is_recursive {
            "add non-recursive"
        } else {
            "add recursive"
        },
        msg: Some(FilteredMsg::ToggleRecursive),
    }
}

Replacement in inflorescence/src/test.rs at line 152 [20.2521]

B:BD[9.26774] → [10.9028:9105]

        Msg::View(view::Msg::Action(action::FilteredMsg::AddUntrackedFile)),

[9.26774]

[9.26842]

        Msg::View(view::Msg::Action(action::FilteredMsg::EnterSubMenu(
            model::SubMenu::Add { recursive: false },
        ))),
    );
    let _task = update(
        &mut state,
        Msg::View(view::Msg::Action(action::FilteredMsg::Confirm)),

Replacement in inflorescence/src/test.rs at line 276 [20.2521]

B:BD[9.27820] → [10.9597:9674]

        Msg::View(view::Msg::Action(action::FilteredMsg::AddUntrackedFile)),

[9.27820]

[9.27888]

        Msg::View(view::Msg::Action(action::FilteredMsg::EnterSubMenu(
            model::SubMenu::Add { recursive: false },
        ))),
    );
    let _task = update(
        &mut state,
        Msg::View(view::Msg::Action(action::FilteredMsg::Confirm)),

Replacement in inflorescence/src/test.rs at line 594 [20.2521]

B:BD[9.29167] → [10.10535:10612]

        Msg::View(view::Msg::Action(action::FilteredMsg::AddUntrackedFile)),

[9.29167]

[9.29235]

        Msg::View(view::Msg::Action(action::FilteredMsg::EnterSubMenu(
            model::SubMenu::Add { recursive: false },
        ))),
    );
    let _task = update(
        &mut state,
        Msg::View(view::Msg::Action(action::FilteredMsg::Confirm)),

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

B:BD[17.4156] → [17.4156:4208]

            | action::FilteredMsg::AddUntrackedFile

[17.4156]

[17.4208]

            | action::FilteredMsg::ToggleRecursive

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

B:BD[19.34227] → [19.34227:34282]

                        | model::SubMenu::ResetChange,

[19.34227]

[19.34282]

                        | model::SubMenu::ResetChange
                        | model::SubMenu::Add { .. },

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

B:BD[16.18388] → [16.18388:18440]

            | action::FilteredMsg::AddUntrackedFile

[16.18388]

[16.18440]

            | action::FilteredMsg::ToggleRecursive

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

[18.6227]

[19.35057]

            Some(model::SubMenu::Add { recursive }) => {
                let task = add_untracked_file(state, model, *recursive);
                *sub_menu = None;
                task
            }

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

B:BD[15.3618547] → [15.3618547:3618653]

        action::FilteredMsg::AddUntrackedFile => {
            add_untracked_file(state, model)
        }

[15.3618547]

[15.3618653]

        action::FilteredMsg::ToggleRecursive => toggle_recursive(sub_menu),

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

[9.64717]

[13.534299]

}
fn toggle_recursive(sub_menu: &mut Option<model::SubMenu>) -> Task<Msg> {
    if let Some(model::SubMenu::Add { recursive }) = sub_menu.as_mut() {
        *recursive = !*recursive;
    }
    Task::none()

Insertion in inflorescence/src/main.rs at line 1637 [23.2763]
[15.3622368]
[18.8216]
```
    recursive: bool,
```
Insertion in inflorescence/src/main.rs at line 1657 [23.2763]
[12.13828]
[12.13828]
```
                recursive,
```