tzemanovic/inflorescence - Change 4WO3ZJM2RNYZCBPS7FGYAEBELYD57OSS7LEUYCWGZBCAY272SNQQC

show untracked files' contents

Created by Tomáš Zemanovič on March 20, 2025

4WO3ZJM2RNYZCBPS7FGYAEBELYD57OSS7LEUYCWGZBCAY272SNQQC

Dependencies

In channels

main

Change contents

Insertion in crates/libflowers_client/src/repo.rs at line 3 [4.7]
[13.75]
[13.75]
```
use pijul::changestore::filesystem::FileSystem;
```

Replacement in crates/libflowers_client/src/repo.rs at line 14 [4.7]

B:BD[4.148] → [7.115:194]

use pijul::change::{Author, BaseHunk, ChangeHeader, Hunk, Local, LocalChange};

[4.120]

[10.7]

use pijul::change::{
    self, get_change_contents, Author, BaseHunk, ChangeHeader, Hunk, Local,
    LocalChange,
};

Replacement in crates/libflowers_client/src/repo.rs at line 56 [4.7]

B:BD[8.449] → [8.449:459]

    Edit,

[8.449]

[8.459]

    Edit {
        line: usize,
        deleted: bool,
        contents: Vec<u8>,
    },

Replacement in crates/libflowers_client/src/repo.rs at line 178 [4.7]
∅:D[10.295] → [4.797:843]
∅:D[7.333] → [4.797:843]
B:BD[4.797] → [4.797:843]
```
    let changed_files = changed_files(&diff);
```
[10.295]
[11.3102]
```
    let changed_files = changed_files(&diff, &repo.changes);
```

Replacement in crates/libflowers_client/src/repo.rs at line 190 [4.7]

B:BD[6.74] → [7.495:543]

    state.changed_files = changed_files(&diff);

[6.74]

[4.899]

    state.changed_files = changed_files(&diff, &state.repo.changes);

Replacement in crates/libflowers_client/src/repo.rs at line 438 [4.7]

B:BD[8.1700] → [8.1700:1757]

fn changed_files(diff: &Diff) -> BTreeSet<ChangedFile> {

[8.1700]

[4.2949]

fn changed_files(
    diff: &Diff,
    repo_changes: &FileSystem,
) -> BTreeSet<ChangedFile> {

Replacement in crates/libflowers_client/src/repo.rs at line 444 [4.7]
B:BD[4.2982] → [4.2982:3019]
```
        .map(|change| match change {
```
[4.2982]
[8.1758]
```
        .map(|change| match dbg!(change) {
```
Replacement in crates/libflowers_client/src/repo.rs at line 491 [4.7]
B:BD[4.3788] → [8.3029:3056]
```
                change: _,
```
[4.3788]
[8.3056]
```
                change,
```

Replacement in crates/libflowers_client/src/repo.rs at line 493 [4.7]

B:BD[8.3085] → [8.3085:3116]

B:BD[8.3116] → [16.298:346]

∅:D[16.346] → [8.3158:3218]

B:BD[8.3158] → [8.3158:3218]

            } => ChangedFile {
                path: Some(local.path.clone()),
                diff: ChangedFileDiff::Edit,
            },

[8.3085]

[4.3851]

            } => {
                let path = Some(local.path.clone());
                let line = local.line;
                let deleted = if let change::Atom::EdgeMap(map) = change {
                    map.edges
                        .first()
                        .map(|edge| edge.flag.is_deleted())
                        .unwrap_or_default()
                } else {
                    false
                };
                // TODO: This fn isn't public in upstream pijul, contrib
                let contents =
                    get_change_contents(repo_changes, change, &diff.contents)
                        .unwrap();
                ChangedFile {
                    path,
                    diff: ChangedFileDiff::Edit {
                        line,
                        deleted,
                        contents,
                    },
                }
            }

Insertion in crates/flowers_ui/src/main.rs at line 4 [2.2763]
[12.496]
[3.1024]
```
use tokio_stream::StreamExt;
```
Insertion in crates/flowers_ui/src/main.rs at line 6 [2.2763]
[3.1025]
[14.23]
```
use core::str;
```

Replacement in crates/flowers_ui/src/main.rs at line 8 [2.2763]

B:BD[14.43] → [14.43:110]

    self, button, column, horizontal_rule, row, text, text_editor,

[14.43]

[14.110]

    self, button, column, horizontal_rule, row, scrollable, text, text_editor,

Replacement in crates/flowers_ui/src/main.rs at line 64 [2.2763]

B:BD[12.678] → [12.678:753]

    let tasks = Task::batch([repo_task, repo_msg_out_task, load_id_task]);

[12.678]

[6.1438]

    let (untracked_file_load_tx, untracked_file_load_rx) =
        watch::channel("".to_string());
    let untracked_file_load_rx =
        WatchStream::from_changes(untracked_file_load_rx);
    let repo_path_clone = repo_path.clone();
    let untracked_file_load_task = Task::run(
        untracked_file_load_rx
            .map(move |path| (repo_path_clone.clone(), path))
            .then(|(repo_path, path)| async {
                load_untracked_file(repo_path, path).await
            }),
        |msg| msg,
    );
    let tasks = Task::batch([
        repo_task,
        repo_msg_out_task,
        load_id_task,
        untracked_file_load_task,
    ]);

Insertion in crates/flowers_ui/src/main.rs at line 93 [2.2763]

[9.130]

[6.1520]

            untracked_file_contents: None,
            untracked_file_load_tx,

Insertion in crates/flowers_ui/src/main.rs at line 109 [2.2763]

[15.58]

    untracked_file_contents: Option<UntrackedFileContents>,
    untracked_file_load_tx: watch::Sender<String>,

Insertion in crates/flowers_ui/src/main.rs at line 114 [2.2763]

[15.78]

enum UntrackedFileContents {
    Loading {
        path: String,
    },
    Loaded {
        path: String,
        data: Vec<u8>,
        // TODO: use pijul pijul::text_changes::Encoding (not exposed yet)
        // encoding: Encoding,
    },
}
#[derive(Debug)]

Insertion in crates/flowers_ui/src/main.rs at line 138 [2.2763]
[5.668]
[13.4573]
```
    NoOp,
```
Insertion in crates/flowers_ui/src/main.rs at line 153 [2.2763]
[15.216]
[5.735]
```
    LoadedUntrackedFile { path: String, data: Vec<u8> },
```

Replacement in crates/flowers_ui/src/main.rs at line 158 [2.2763]

B:BD[11.6347] → [11.6347:6410]

        |repo: &repo::State, ix: usize| -> cursor::Selection {

[11.6347]

[11.6410]

        |repo: &repo::State,
         ix: usize,
         untracked_file_contents: &mut Option<UntrackedFileContents>,
         untracked_file_load_tx: &watch::Sender<String>|
         -> cursor::Selection {

Insertion in crates/flowers_ui/src/main.rs at line 164 [2.2763]

[11.6487]


            // Load the file
            untracked_file_load_tx.send(path.clone()).unwrap();
            *untracked_file_contents =
                Some(UntrackedFileContents::Loading { path: path.clone() });

Insertion in crates/flowers_ui/src/main.rs at line 180 [2.2763]
[11.6718]
[15.217]
```
        Message::NoOp => Task::none(),
```

Replacement in crates/flowers_ui/src/main.rs at line 207 [2.2763]

B:BD[11.7561] → [11.7561:7632]

                                    untracked_file_selection(repo, ix)

[11.7561]

[11.7632]

                                    untracked_file_selection(
                                        repo,
                                        ix,
                                        &mut state.untracked_file_contents,
                                        &state.untracked_file_load_tx,
                                    )

Replacement in crates/flowers_ui/src/main.rs at line 219 [2.2763]

B:BD[11.7910] → [11.7910:7977]

                                untracked_file_selection(repo, ix)

[11.7910]

[11.7977]

                                untracked_file_selection(
                                    repo,
                                    ix,
                                    &mut state.untracked_file_contents,
                                    &state.untracked_file_load_tx,
                                )

Replacement in crates/flowers_ui/src/main.rs at line 240 [2.2763]

B:BD[7.4353] → [11.8462:8529]

                                untracked_file_selection(repo, ix)

[7.4353]

[7.4412]

                                untracked_file_selection(
                                    repo,
                                    ix,
                                    &mut state.untracked_file_contents,
                                    &state.untracked_file_load_tx,
                                )

Replacement in crates/flowers_ui/src/main.rs at line 263 [2.2763]

B:BD[7.5492] → [11.8922:8991]

                            Some(untracked_file_selection(repo, ix))

[7.5492]

[5.1547]

                            Some(untracked_file_selection(
                                repo,
                                ix,
                                &mut state.untracked_file_contents,
                                &state.untracked_file_load_tx,
                            ))

Replacement in crates/flowers_ui/src/main.rs at line 282 [2.2763]

B:BD[11.9435] → [11.9435:9502]

                                untracked_file_selection(repo, ix)

[11.9435]

[11.9502]

                                untracked_file_selection(
                                    repo,
                                    ix,
                                    &mut state.untracked_file_contents,
                                    &state.untracked_file_load_tx,
                                )

Replacement in crates/flowers_ui/src/main.rs at line 294 [2.2763]

B:BD[11.9751] → [11.9751:9814]

                            untracked_file_selection(repo, ix)

[11.9751]

[11.9814]

                            untracked_file_selection(
                                repo,
                                ix,
                                &mut state.untracked_file_contents,
                                &state.untracked_file_load_tx,
                            )

Replacement in crates/flowers_ui/src/main.rs at line 310 [2.2763]

B:BD[11.10354] → [11.10354:10421]

                                untracked_file_selection(repo, ix)

[11.10354]

[11.10421]

                                untracked_file_selection(
                                    repo,
                                    ix,
                                    &mut state.untracked_file_contents,
                                    &state.untracked_file_load_tx,
                                )

Replacement in crates/flowers_ui/src/main.rs at line 329 [2.2763]

B:BD[11.10952] → [11.10952:11025]

                                Some(untracked_file_selection(repo, ix))

[11.10952]

[11.11025]

                                Some(untracked_file_selection(
                                    repo,
                                    ix,
                                    &mut state.untracked_file_contents,
                                    &state.untracked_file_load_tx,
                                ))

Insertion in crates/flowers_ui/src/main.rs at line 346 [2.2763]

[5.2594]

[10.1381]

            match &selection {
                cursor::Selection::UntrackedFile { path, .. } => {
                    // Load the file
                    state.untracked_file_load_tx.send(path.clone()).unwrap();
                    state.untracked_file_contents =
                        Some(UntrackedFileContents::Loading {
                            path: path.clone(),
                        });
                }
                cursor::Selection::ChangedFile { .. } => {}
            }

Replacement in crates/flowers_ui/src/main.rs at line 389 [2.2763]

B:BD[11.12334] → [11.12334:12399]

                        Some(untracked_file_selection(repo, ix))

[11.12334]

[8.7490]

                        Some(untracked_file_selection(
                            repo,
                            ix,
                            &mut state.untracked_file_contents,
                            &state.untracked_file_load_tx,
                        ))

Insertion in crates/flowers_ui/src/main.rs at line 525 [2.2763]

[12.1055]

[11.14755]

        Message::LoadedUntrackedFile { path, data } => {
            match &state.untracked_file_contents {
                Some(UntrackedFileContents::Loading { path: loading_path }) => {
                    if &path == loading_path {
                        state.untracked_file_contents =
                            Some(UntrackedFileContents::Loaded { path, data });
                    }
                }
                // Reloaded file
                Some(UntrackedFileContents::Loaded {
                    path: loaded_path,
                    ..
                }) => {
                    if &path == loaded_path {
                        state.untracked_file_contents =
                            Some(UntrackedFileContents::Loaded { path, data });
                    }
                }
                None => {}
            }
            Task::none()
        }

Replacement in crates/flowers_ui/src/main.rs at line 601 [2.2763]

B:BD[11.15531] → [11.15531:15972]

                    cursor::Selection::UntrackedFile { ix: _, path } => repo
                        .untracked_files
                        .iter()
                        .enumerate()
                        .find(|(_ix, file_path)| *file_path == path)
                        .map(|(ix, path)| cursor::Selection::UntrackedFile {
                            ix,
                            path: path.clone(),
                        }),

[11.15531]

[11.15972]

                    cursor::Selection::UntrackedFile { ix: _, path } => {
                        state
                            .untracked_file_load_tx
                            .send(path.clone())
                            .unwrap();
                        repo.untracked_files
                            .iter()
                            .enumerate()
                            .find(|(_ix, file_path)| *file_path == path)
                            .map(|(ix, path)| {
                                cursor::Selection::UntrackedFile {
                                    ix,
                                    path: path.clone(),
                                }
                            })
                    }

Insertion in crates/flowers_ui/src/main.rs at line 667 [2.2763]

[5.3183]

[2.3221]

}
async fn load_untracked_file(repo_path: PathBuf, file_path: String) -> Message {
    let mut path = repo_path;
    path.push(&file_path);
    if let Ok(data) = tokio::fs::read(&path).await {
        Message::LoadedUntrackedFile {
            path: file_path,
            data,
        }
    } else {
        Message::NoOp
    }

Insertion in crates/flowers_ui/src/main.rs at line 748 [2.2763]

[15.3500]

        };
        let selection_details = match state.cursor.selection.as_ref() {
            Some(cursor::Selection::UntrackedFile { path, .. }) => {
                debug_assert!(repo.untracked_files.contains(path));
                let diff = match &state.untracked_file_contents {
                    Some(UntrackedFileContents::Loaded {
                        path: loaded_path,
                        data,
                    }) if loaded_path == path =>
                    // TODO: use encoding
                    {
                        el(scrollable(text(
                            str::from_utf8(data).unwrap_or("Not UTF-8"),
                        ))
                        .width(Length::Fill))
                    }
                    _ => el(text("Loading...")),
                };
                el(column([el(text("Diff:")), diff]))
            }
            Some(cursor::Selection::ChangedFile { path, .. }) => {
                if let Some(path) = path {
                    debug_assert!(repo
                        .changed_files
                        .iter()
                        .any(|file| file.path.as_ref() == Some(path)));
                }
                el(row([]))
            }
            None => el(row([])),

Replacement in crates/flowers_ui/src/main.rs at line 794 [2.2763]

B:BD[15.3923] → [15.3923:3998]

            el(column([record_msg_editor]).width(Length::FillPortion(1))),

[15.3923]

[11.18274]

            el(column([record_msg_editor, selection_details])
                .width(Length::FillPortion(1))),