tzemanovic/inflorescence - Change HPSOAD4RXHXU7TSVX2AD5ZDGHMS7HLYNRARWHJCXGGH5RWW7LH6QC

fix moved tracked file view

Created by Tomáš Zemanovič on November 16, 2025

HPSOAD4RXHXU7TSVX2AD5ZDGHMS7HLYNRARWHJCXGGH5RWW7LH6QC

Dependencies

In channels

main

Change contents

Replacement in libflorescence/src/repo.rs at line 15 [2.7]
∅:D[5.55] → [4.75:112]
B:BD[4.75] → [4.75:112]
```
use pijul::changestore::ChangeStore;
```
[5.55]
[10.181]
```
use pijul::changestore::{ChangeStore, FileMetadata};
```

Replacement in libflorescence/src/repo.rs at line 113 [2.7]

B:BD[3.362] → [3.362:381]

    Move,
    Del,

[3.362]

[3.381]

    Move {
        old_path: String,
    },
    Del {
        contents: Option<Contents>,
    },

Replacement in libflorescence/src/repo.rs at line 161 [2.7]

B:BD[7.666] → [7.666:743]

        ChangedFileDiff::Move => None,
        ChangedFileDiff::Del => None,

[7.666]

[7.743]

        ChangedFileDiff::Move { .. } => None,
        ChangedFileDiff::Del { .. } => None,

Replacement in libflorescence/src/repo.rs at line 809 [2.7]

B:BD[3.1815] → [3.1815:1861]

B:BD[3.1861] → [6.458:642]

                add: _,
                path,
            } => {
                changes
                    .entry(path.clone())
                    .or_default()
                    .insert(ChangedFileDiff::Move);
            }

[3.1815]

[2.3081]

                add,
                path: old_path,
            } => match add {
                change::Atom::NewVertex(add) => {
                    let FileMetadata {
                        basename: new_path,
                        metadata: _,
                        ..
                    } = FileMetadata::read(
                        &diff.contents[add.start.0.into()..add.end.0.into()],
                    );
                    changes.entry(new_path.to_string()).or_default().insert(
                        ChangedFileDiff::Move {
                            old_path: old_path.clone(),
                        },
                    );
                }
                change::Atom::EdgeMap(_edge_map) => todo!(),
            },

Replacement in libflorescence/src/repo.rs at line 830 [2.7]
B:BD[3.2013] → [3.2013:2042]
```
                contents: _,
```
[3.2013]
[2.3160]
```
                contents,
```
Replacement in libflorescence/src/repo.rs at line 832 [2.7]
B:BD[2.3182] → [3.2043:2072]
```
                encoding: _,
```
[2.3182]
[6.643]
```
                encoding,
```

Insertion in libflorescence/src/repo.rs at line 834 [2.7]

[6.662]

                let contents = if let Some(contents) = contents.as_ref() {
                    let raw_contents = get_change_contents(
                        repo_changes,
                        contents,
                        &diff.contents,
                    )?;
                    Some(try_decode_contents(raw_contents, encoding))
                } else {
                    None
                };

Replacement in libflorescence/src/repo.rs at line 848 [2.7]

B:BD[6.761] → [6.761:812]

                    .insert(ChangedFileDiff::Del);

[6.761]

[6.812]

                    .insert(ChangedFileDiff::Del { contents });

Replacement in libflorescence/src/diff.rs at line 49 [14.392]

B:BD[14.1600] → [14.1600:1609]

    Del,

[14.1600]

[14.1609]

    // Also present in `DiffWithoutContents` to show that the whole file is
    // deleted
    Del {
        contents: Option<String>,
    },

Insertion in libflorescence/src/diff.rs at line 55 [14.392]

[14.1620]

    /// Also present in `DiffWithoutContents` to show the old path
    Move,

Replacement in libflorescence/src/diff.rs at line 63 [14.392]
B:BD[14.1791] → [14.1791:1801]
```
    Move,
```
[14.1791]
[14.1801]
```
    Move {
        old_path: String,
    },
    Del,
```

Replacement in inflorescence_view/src/diff.rs at line 226 [13.417]

B:BD[13.8590] → [13.8590:8644]

        DiffWithContents::Del => el(text("Deleted")),

[13.8590]

[13.8644]

        DiffWithContents::Del { contents } => {
            if let Some(contents) = contents {
                let line_num = 1;
                let lines = contents_to_lines(contents);
                let max_line_num = line_num + lines.len();
                let line_num_digits = max_line_num.to_string().len();
                let lines_view =
                    lines.into_iter().enumerate().map(|(ix, line)| {
                        line_view(
                            LineKind::Deleted,
                            line_num + ix,
                            line_num_digits,
                            line,
                        )
                    });
                el(column(lines_view))
            } else {
                el(text("Deleted"))
            }
        }

Insertion in inflorescence_view/src/diff.rs at line 248 [13.417]
[13.8700]
[13.8700]
```
        DiffWithContents::Move => el(text(format!("Moved"))),
```
Deletion in inflorescence_view/src/diff.rs at line 260 [13.417]
B:BD[13.8857] → [13.8857:8912]
```
        DiffWithoutContents::Move => el(text("Move")),
```

Insertion in inflorescence_view/src/diff.rs at line 309 [13.417]

[13.10576]

        DiffWithoutContents::Move { old_path } => {
            el(text(format!("Moved from {old_path}")))
        }
        DiffWithoutContents::Del => el(text("Deleted file")),

Replacement in inflorescence_model/src/to_record/test.rs at line 146 [28.5208]
B:BD[28.9962] → [28.9962:10012]
```
    let change_a_1 = repo::ChangedFileDiff::Move;
```
[28.9962]
[28.10012]
```
    let change_a_1 = repo::ChangedFileDiff::SolveNameConflict;
```
Replacement in inflorescence_model/src/to_record/test.rs at line 148 [28.5208]
B:BD[28.10013] → [28.10013:10062]
```
    let change_b_1 = repo::ChangedFileDiff::Del;
```
[28.10013]
[28.10062]
```
    let change_b_1 = repo::ChangedFileDiff::SolveNameConflict;
```

Replacement in inflorescence/src/test.rs at line 2 [29.2521]

B:BD[18.47] → [23.10449:10536]

    init, reindex_selection, repo_got_change_diffs, selection, update, Msg,
    State,

[18.47]

[18.137]

    diff, file, init, reindex_selection, repo, repo_got_change_diffs,
    selection, update, Msg, State,

Deletion in inflorescence/src/test.rs at line 12 [29.2521]
B:BD[16.1581] → [17.144:178]
```
use libflorescence::{file, repo};
```

Replacement in inflorescence/src/test.rs at line 776 [29.2521]

B:BD[17.5276] → [17.5276:5310]

    let task = reindex_selection(

[17.5276]

[26.8109]

    // // Add a diff that would make `reindex_selection` expect that the file
    // doesn't exist
    {
        let changed_file = BTreeSet::from_iter([repo::ChangedFileDiff::Del {
            contents: None,
        }]);
        assert!(!diff::should_file_exist(&changed_file));
        ready_state
            .repo
            .changed_files
            .insert("changed_1.rs".to_string(), changed_file);
    }
    let mut task = reindex_selection(

Replacement in inflorescence/src/test.rs at line 802 [29.2521]

B:BD[17.5678] → [17.5678:5762]

    assert!(task.is_none());
    assert!(state.files.diffs_cache.inner.is_empty());

[17.5678]

[17.5762]

    assert!(task.is_some());
    let msg = await_next_msg(&mut task).await;
    assert_matches!(
        &msg,
        crate::Msg::File(file::Msg::SrcFileDoesntExist { .. })
    );
    // The file will be assembled from the diff
    assert_matches!(
        state
            .files
            .diffs_cache
            .inner
            .peek(&file::id_parts_hash("changed_1.rs", file::Kind::Changed)),
        Some(file::Diff::Loaded(_))
    );
    // Clear the cache for next test case
    state.files.diffs_cache.inner.clear();

Replacement in inflorescence/src/selection.rs at line 1648 [30.26]

B:BD[25.70981] → [25.70981:71118]

                    if let Some(diffs) = ctx.repo.changed_files.get(&path)
                        && diff::any_diff_has_contents(diffs)

[25.70981]

[25.71118]

                    let file_task = if let Some(diffs) =
                        ctx.repo.changed_files.get(&path)

Replacement in inflorescence/src/selection.rs at line 1651 [30.26]

B:BD[25.71140] → [25.71140:71236]

                        file::load_src_file_if_not_cached(ctx.files, id);
                    }

[25.71140]

[25.71236]

                        if diff::should_file_exist(diffs) {
                            file::load_src_file_if_not_cached(ctx.files, id);
                            Task::none()
                        } else {
                            file::src_file_doesnt_exist(ctx.files, id, diffs)
                                .map(crate::Msg::File)
                        }
                    } else {
                        Task::none()
                    };

Replacement in inflorescence/src/selection.rs at line 1663 [30.26]

B:BD[25.71359] → [25.71359:71413]

                    (Some(selection), selection_task)

[25.71359]

[25.71413]

                    (Some(selection), Task::batch([selection_task, file_task]))

Replacement in inflorescence/src/selection.rs at line 1971 [30.26]
B:BD[27.54195] → [27.54195:54246]
```
    match file::try_get_src_file(files, file_id) {
```
[27.54195]
[22.46480]
```
    let task = match file::try_get_src_file(files, file_id) {
```
Insertion in inflorescence/src/selection.rs at line 1981 [30.26]
[27.54458]
[22.47086]
```
            Task::none()
```
Replacement in inflorescence/src/selection.rs at line 1990 [30.26]
∅:D[25.75664] → [22.47343:47395]
B:BD[22.47343] → [22.47343:47395]
```
            if diff::any_diff_has_contents(diffs) {
```
[22.47343]
[22.47395]
```
            if diff::should_file_exist(diffs) {
```

Insertion in inflorescence/src/selection.rs at line 1992 [30.26]

[22.47457]

                Task::none()
            } else {
                file::src_file_doesnt_exist(files, id, diffs)
                    .map(crate::Msg::File)

Replacement in inflorescence/src/selection.rs at line 1998 [30.26]
B:BD[22.47506] → [24.16701:16707]
```
    }
```
[22.47506]
[22.47513]
```
    };
```
Replacement in inflorescence/src/selection.rs at line 2017 [30.26]
B:BD[22.48023] → [24.16946:16976]
```
    (selection, Task::none())
```
[22.48023]
[27.54459]
```
    (selection, task)
```

Replacement in inflorescence/src/main.rs at line 1168 [31.2763]

B:BD[17.9541] → [21.2400:2439]

                if selection.is_some()

[17.9541]

[25.92966]

                let task = if selection.is_some()

Deletion in inflorescence/src/main.rs at line 1170 [31.2763]
∅:D[25.93037] → [21.2505:2563]
B:BD[21.2505] → [21.2505:2563]
```
                    && diff::any_diff_has_contents(diffs)
```

Replacement in inflorescence/src/main.rs at line 1171 [31.2763]

B:BD[21.2581] → [21.2581:2860]

∅:D[21.2860] → [17.10097:10115]

B:BD[17.10097] → [17.10097:10115]

                    file::load_src_file_if_not_cached(
                        files,
                        file::Id {
                            path: path.clone(),
                            file_kind: file::Kind::Changed,
                        },
                    );
                }

[21.2581]

[17.10115]

                    let id = file::Id {
                        path: path.clone(),
                        file_kind: file::Kind::Changed,
                    };
                    if diff::should_file_exist(diffs) {
                        file::load_src_file_if_not_cached(files, id);
                        Task::none()
                    } else {
                        file::src_file_doesnt_exist(files, id, diffs)
                            .map(Msg::File)
                    }
                } else {
                    Task::none()
                };

Replacement in inflorescence/src/main.rs at line 1186 [31.2763]
∅:D[17.10116] → [15.11112:11154]
B:BD[15.11112] → [15.11112:11154]
```
                (selection, Task::none())
```
[17.10116]
[15.11154]
```
                (selection, task)
```
Insertion in inflorescence/src/file.rs at line 13 [12.1806]
[12.1946]
[20.598]
```
use std::borrow::Cow;
```
Deletion in inflorescence/src/file.rs at line 29 [12.1806]
B:BD[12.2283] → [27.66831:66878]
```
    // TODO watch bad, it has to queue things!
```

Insertion in inflorescence/src/file.rs at line 42 [12.1806]

[12.2611]

    /// File cannot be loaded because it's either been moved or deleted
    SrcFileDoesntExist {
        id: Id,
    },

Insertion in inflorescence/src/file.rs at line 167 [12.1806]

[12.5970]

        Msg::SrcFileDoesntExist { id } => {
            let id_hash = id_hash(&id);
            return Some(Loaded {
                file_id: id_hash,
                unchanged_sections: HashSet::new(),
            });
        }

Insertion in inflorescence/src/file.rs at line 217 [12.1806]

[12.6711]

    }
}
pub fn src_file_doesnt_exist(
    state: &mut State,
    id: Id,
    changed_file: &repo::ChangedFile,
) -> Task<Msg> {
    let id_hash = id_hash(&id);
    if !state.diffs_cache.inner.contains(&id_hash) {
        let content = diff::FileContent::Decoded(Cow::from(""));
        let file = diff::init_file(content, Some(changed_file));
        diffs_cache_put(&mut state.diffs_cache, id_hash, Diff::Loaded(file));
        return Task::done(Msg::SrcFileDoesntExist { id });

Insertion in inflorescence/src/file.rs at line 232 [12.1806]
[12.6717]
[12.6717]
```
    Task::none()
```

Replacement in inflorescence/src/diff.rs at line 45 [7.5018]

B:BD[9.4699] → [9.4699:4801]

            repo::ChangedFileDiff::Move => {
                without.push(DiffWithoutContents::Move);

[9.4699]

[9.4801]

            repo::ChangedFileDiff::Move{ old_path } => {
                without.push(DiffWithoutContents::Move { old_path: old_path.clone() });
                with.push(DiffWithContents::Move);

Replacement in inflorescence/src/diff.rs at line 49 [7.5018]

B:BD[9.4816] → [9.4816:4910]

            repo::ChangedFileDiff::Del => {
                with.push(DiffWithContents::Del);

[9.4816]

[9.4910]

            repo::ChangedFileDiff::Del { contents } => {
                let contents = match contents {
                    Some(repo::Contents::Decoded(lines) | repo::Contents::ShortBase64(lines)) =>  Some(lines.clone()),
                    Some(repo::Contents::UnknownEncoding(_)) | None => None
                };
                without.push(DiffWithoutContents::Del);
                with.push(DiffWithContents::Del{ contents });

Replacement in inflorescence/src/diff.rs at line 138 [7.5018]

B:BD[9.8673] → [11.1724:1983]

/// Returns true if any of the changed file's diffs has contents
pub fn any_diff_has_contents(changed_file: &repo::ChangedFile) -> bool {
    let (with_contents, _without_contents) =
        from_repo_changed_file(changed_file);
    !with_contents.is_empty()

[9.8673]

[19.9073]

/// Returns true if from the diffs imply that the file should exist.
pub fn should_file_exist(changed_file: &repo::ChangedFile) -> bool {
    for change in changed_file {
        match change {
            repo::ChangedFileDiff::Del { .. }
            | repo::ChangedFileDiff::AddRoot
            | repo::ChangedFileDiff::DelRoot => return false,
            repo::ChangedFileDiff::Move { .. }
            | repo::ChangedFileDiff::Undel
            | repo::ChangedFileDiff::Add
            | repo::ChangedFileDiff::SolveNameConflict
            | repo::ChangedFileDiff::UnsolveNameConflict
            | repo::ChangedFileDiff::Edit { .. }
            | repo::ChangedFileDiff::Replacement { .. }
            | repo::ChangedFileDiff::SolveOrderConflict
            | repo::ChangedFileDiff::UnsolveOrderConflict
            | repo::ChangedFileDiff::ResurrectZombines => {}
        }
    }
    true

Replacement in inflorescence/src/diff.rs at line 207 [7.5018]
B:BD[7.7052] → [8.20873:20912]
```
            DiffWithContents::Del => {
```
[7.7052]
[7.7102]
```
            DiffWithContents::Move => {
```

Replacement in inflorescence/src/diff.rs at line 209 [7.5018]

B:BD[7.7152] → [7.7152:7232]

                let deleted: Vec<_> = file_lines.map(str::to_string).collect();

[7.7152]

[7.7232]

                let lines: Vec<_> = file_lines.map(str::to_string).collect();
                let max_line_num = lines.len();
                sections.push(Section::Unchanged(lines));
                return Combined {
                    sections,
                    max_line_num,
                };
            }
            DiffWithContents::Del { contents } => {
                let deleted = contents
                    .as_deref()
                    .map(contents_to_lines)
                    .unwrap_or_default();

Replacement in iced_expl_widget/src/nav_scrollable.rs at line 651 [24.28126]

B:BD[28.22418] → [28.22418:22479]

                Element::from(if ix == selected_section_ix {

[28.22418]

[28.22479]

                Element::from(if Some(ix) == selected_section_ix {

Replacement in iced_expl_widget/src/nav_scrollable.rs at line 710 [24.28126]
B:BD[28.23285] → [28.23285:23333]
```
    pub fn select_fst_section(&self) -> usize {
```
[28.23285]
[24.48282]
```
    pub fn select_fst_section(&self) -> Option<usize> {
```

Replacement in iced_expl_widget/src/nav_scrollable.rs at line 713 [24.28126]

B:BD[28.23378] → [28.23378:23444]

        if let Some(ix) = inner.selected_section {
            ix

[28.23378]

[28.23444]

        if inner.skip_sections.len() == inner.section_heights.len() {
            None
        } else if let Some(ix) = inner.selected_section {
            Some(ix)

Deletion in iced_expl_widget/src/nav_scrollable.rs at line 718 [24.28126]

B:BD[28.23461] → [28.23461:23641]

            debug_assert!(
                inner.skip_sections.len() < inner.section_heights.len(),
                "There has to be at least one non-skip section"
            );

Replacement in iced_expl_widget/src/nav_scrollable.rs at line 723 [24.28126]
B:BD[28.23872] → [28.23872:23901]
```
            selected_section
```
[28.23872]
[24.48511]
```
            Some(selected_section)
```

fix moved tracked file view

Dependencies

In channels

Change contents

Replacement in libflorescence/src/repo.rs at line 15 [2.7]

Replacement in libflorescence/src/repo.rs at line 113 [2.7]

Replacement in libflorescence/src/repo.rs at line 161 [2.7]

Replacement in libflorescence/src/repo.rs at line 809 [2.7]

Replacement in libflorescence/src/repo.rs at line 830 [2.7]

Replacement in libflorescence/src/repo.rs at line 832 [2.7]

Insertion in libflorescence/src/repo.rs at line 834 [2.7]

Replacement in libflorescence/src/repo.rs at line 848 [2.7]

Replacement in libflorescence/src/diff.rs at line 49 [14.392]

Insertion in libflorescence/src/diff.rs at line 55 [14.392]

Replacement in libflorescence/src/diff.rs at line 63 [14.392]

Replacement in inflorescence_view/src/diff.rs at line 226 [13.417]

Insertion in inflorescence_view/src/diff.rs at line 248 [13.417]

Deletion in inflorescence_view/src/diff.rs at line 260 [13.417]

Insertion in inflorescence_view/src/diff.rs at line 309 [13.417]

Replacement in inflorescence_model/src/to_record/test.rs at line 146 [28.5208]

Replacement in inflorescence_model/src/to_record/test.rs at line 148 [28.5208]

Replacement in inflorescence/src/test.rs at line 2 [29.2521]

Deletion in inflorescence/src/test.rs at line 12 [29.2521]

Replacement in inflorescence/src/test.rs at line 776 [29.2521]

Replacement in inflorescence/src/test.rs at line 802 [29.2521]

Replacement in inflorescence/src/selection.rs at line 1648 [30.26]

Replacement in inflorescence/src/selection.rs at line 1651 [30.26]

Replacement in inflorescence/src/selection.rs at line 1663 [30.26]

Replacement in inflorescence/src/selection.rs at line 1971 [30.26]

Insertion in inflorescence/src/selection.rs at line 1981 [30.26]

Replacement in inflorescence/src/selection.rs at line 1990 [30.26]

Insertion in inflorescence/src/selection.rs at line 1992 [30.26]

Replacement in inflorescence/src/selection.rs at line 1998 [30.26]

Replacement in inflorescence/src/selection.rs at line 2017 [30.26]

Replacement in inflorescence/src/main.rs at line 1168 [31.2763]

Deletion in inflorescence/src/main.rs at line 1170 [31.2763]

Replacement in inflorescence/src/main.rs at line 1171 [31.2763]

Replacement in inflorescence/src/main.rs at line 1186 [31.2763]

Insertion in inflorescence/src/file.rs at line 13 [12.1806]

Deletion in inflorescence/src/file.rs at line 29 [12.1806]