tzemanovic/inflorescence - Change W4LFX7IHQ7SDX67ATSGWDB5IN6472ZJDBKY2XZ54SBJEYD5GAT5QC

group diffs by file name

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

W4LFX7IHQ7SDX67ATSGWDB5IN6472ZJDBKY2XZ54SBJEYD5GAT5QC

Dependencies

In channels

main

Change contents

Replacement in crates/libflowers_client/src/repo.rs at line 30 [2.7]
B:BD[6.235] → [6.235:281]
```
    pub changed_files: BTreeSet<ChangedFile>,
```
[6.235]
[6.281]
```
    pub changed_files: ChangedFiles,
```
Replacement in crates/libflowers_client/src/repo.rs at line 39 [2.7]
B:BD[4.281] → [5.77:123]
```
    pub changed_files: BTreeSet<ChangedFile>,
```
[4.281]
[5.123]
```
    pub changed_files: ChangedFiles,
```

Replacement in crates/libflowers_client/src/repo.rs at line 42 [2.7]

B:BD[5.126] → [5.126:207]

B:BD[5.207] → [9.7:37]

∅:D[9.37] → [5.229:262]

B:BD[5.229] → [5.229:262]

#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord)]
pub struct ChangedFile {
    pub path: Option<String>,
    pub diff: ChangedFileDiff,
}

[5.126]

[5.262]

pub type ChangedFiles = BTreeMap<String, ChangedFile>;
pub type ChangedFile = BTreeSet<ChangedFileDiff>;
pub const ROOT_FILE: &str = ".";

Replacement in crates/libflowers_client/src/repo.rs at line 89 [2.7]
B:BD[6.670] → [6.670:716]
```
        changed_files: BTreeSet<ChangedFile>,
```
[6.670]
[6.716]
```
        changed_files: ChangedFiles,
```

Replacement in crates/libflowers_client/src/repo.rs at line 436 [2.7]

B:BD[5.1700] → [10.396:491]

∅:D[10.491] → [2.2949:2982]

∅:D[5.1757] → [2.2949:2982]

B:BD[2.2949] → [2.2949:2982]

B:BD[2.2982] → [10.492:535]

fn changed_files(
    diff: &Diff,
    repo_changes: &FileSystem,
) -> BTreeSet<ChangedFile> {
    diff.changes
        .iter()
        .map(|change| match dbg!(change) {

[5.1700]

[5.1758]

fn changed_files(diff: &Diff, repo_changes: &FileSystem) -> ChangedFiles {
    let mut changes: ChangedFiles = BTreeMap::new();
    for change in diff.changes.iter() {
        match dbg!(change) {

Replacement in crates/libflowers_client/src/repo.rs at line 444 [2.7]

B:BD[5.1861] → [5.1861:1892]

B:BD[5.1892] → [9.40:82]

∅:D[9.82] → [5.1928:1988]

B:BD[5.1928] → [5.1928:1988]

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

[5.1861]

[2.3081]

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

Replacement in crates/libflowers_client/src/repo.rs at line 455 [2.7]

B:BD[5.2072] → [5.2072:2103]

B:BD[5.2103] → [9.83:125]

∅:D[9.125] → [5.2139:2198]

B:BD[5.2139] → [5.2139:2198]

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

[5.2072]

[2.3234]

            } => {
                changes
                    .entry(path.clone())
                    .or_default()
                    .insert(ChangedFileDiff::Del);
            }

Replacement in crates/libflowers_client/src/repo.rs at line 466 [2.7]

B:BD[5.2284] → [5.2284:2315]

B:BD[5.2315] → [9.126:168]

∅:D[9.168] → [5.2351:2412]

B:BD[5.2351] → [5.2351:2412]

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

[5.2284]

[2.3391]

            } => {
                changes
                    .entry(path.clone())
                    .or_default()
                    .insert(ChangedFileDiff::Undel);
            }

Replacement in crates/libflowers_client/src/repo.rs at line 478 [2.7]

B:BD[5.2530] → [5.2530:2561]

B:BD[5.2561] → [9.169:211]

∅:D[9.211] → [5.2597:2731]

B:BD[5.2597] → [5.2597:2731]

B:BD[5.2731] → [9.212:254]

∅:D[9.254] → [5.2767:2917]

B:BD[5.2767] → [5.2767:2917]

B:BD[5.2917] → [9.255:297]

∅:D[9.297] → [5.2953:3028]

B:BD[5.2953] → [5.2953:3028]

            } => ChangedFile {
                path: Some(path.clone()),
                diff: ChangedFileDiff::Add,
            },
            BaseHunk::SolveNameConflict { name: _, path } => ChangedFile {
                path: Some(path.clone()),
                diff: ChangedFileDiff::SolveNameConflict,
            },
            BaseHunk::UnsolveNameConflict { name: _, path } => ChangedFile {
                path: Some(path.clone()),
                diff: ChangedFileDiff::UnsolveNameConflict,
            },

[5.2530]

[2.3712]

            } => {
                changes
                    .entry(path.clone())
                    .or_default()
                    .insert(ChangedFileDiff::Add);
            }
            BaseHunk::SolveNameConflict { name: _, path } => {
                changes
                    .entry(path.clone())
                    .or_default()
                    .insert(ChangedFileDiff::SolveNameConflict);
            }
            BaseHunk::UnsolveNameConflict { name: _, path } => {
                changes
                    .entry(path.clone())
                    .or_default()
                    .insert(ChangedFileDiff::UnsolveNameConflict);
            }

Deletion in crates/libflowers_client/src/repo.rs at line 501 [2.7]
B:BD[10.580] → [10.580:633]
```
                let path = Some(local.path.clone());
```

Replacement in crates/libflowers_client/src/repo.rs at line 515 [2.7]

B:BD[10.1203] → [10.1203:1309]

                ChangedFile {
                    path,
                    diff: ChangedFileDiff::Edit {

[10.1203]

[10.1309]

                changes.entry(local.path.clone()).or_default().insert(
                    ChangedFileDiff::Edit {

Replacement in crates/libflowers_client/src/repo.rs at line 521 [2.7]
B:BD[10.1429] → [10.1429:1447]
```
                }
```
[10.1429]
[10.1447]
```
                );
```

Replacement in crates/libflowers_client/src/repo.rs at line 528 [2.7]

B:BD[5.3308] → [5.3308:3339]

B:BD[5.3339] → [9.347:395]

∅:D[9.395] → [5.3381:3527]

B:BD[5.3381] → [5.3381:3527]

B:BD[5.3527] → [9.396:444]

∅:D[9.444] → [5.3569:3643]

B:BD[5.3569] → [5.3569:3643]

            } => ChangedFile {
                path: Some(local.path.clone()),
                diff: ChangedFileDiff::Replacement,
            },
            BaseHunk::SolveOrderConflict { change: _, local } => ChangedFile {
                path: Some(local.path.clone()),
                diff: ChangedFileDiff::SolveOrderConflict,
            },

[5.3308]

[5.3643]

            } => {
                changes
                    .entry(local.path.clone())
                    .or_default()
                    .insert(ChangedFileDiff::Replacement);
            }
            BaseHunk::SolveOrderConflict { change: _, local } => {
                changes
                    .entry(local.path.clone())
                    .or_default()
                    .insert(ChangedFileDiff::SolveOrderConflict);
            }

Replacement in crates/libflowers_client/src/repo.rs at line 541 [2.7]

B:BD[5.3712] → [5.3712:3742]

B:BD[5.3742] → [9.445:497]

∅:D[9.497] → [5.3788:3871]

B:BD[5.3788] → [5.3788:3871]

                ChangedFile {
                    path: Some(local.path.clone()),
                    diff: ChangedFileDiff::UnsolveOrderConflict,
                }

[5.3712]

[5.3871]

                changes
                    .entry(local.path.clone())
                    .or_default()
                    .insert(ChangedFileDiff::UnsolveOrderConflict);

Replacement in crates/libflowers_client/src/repo.rs at line 550 [2.7]

B:BD[5.3943] → [5.3943:3974]

B:BD[5.3974] → [9.498:546]

∅:D[9.546] → [5.4016:4215]

B:BD[5.4016] → [5.4016:4215]

B:BD[5.4215] → [9.547:575]

∅:D[9.575] → [5.4254:4443]

B:BD[5.4254] → [5.4254:4443]

B:BD[5.4443] → [9.576:604]

∅:D[9.604] → [5.4482:4545]

B:BD[5.4482] → [5.4482:4545]

∅:D[5.4545] → [4.544:574]

B:BD[2.4415] → [4.544:574]

            } => ChangedFile {
                path: Some(local.path.clone()),
                diff: ChangedFileDiff::ResurrectZombines,
            },
            BaseHunk::AddRoot { name: _, inode: _ } => ChangedFile {
                // TODO: maybe they don't all have path?
                path: None,
                diff: ChangedFileDiff::AddRoot,
            },
            BaseHunk::DelRoot { name: _, inode: _ } => ChangedFile {
                // TODO: maybe they don't all have path?
                path: None,
                diff: ChangedFileDiff::DelRoot,
            },
        })
        .collect()

[5.3943]

[4.574]

            } => {
                changes
                    .entry(local.path.clone())
                    .or_default()
                    .insert(ChangedFileDiff::ResurrectZombines);
            }
            BaseHunk::AddRoot { name: _, inode: _ } => {
                changes
                    .entry(ROOT_FILE.to_string())
                    .or_default()
                    .insert(ChangedFileDiff::AddRoot);
            }
            BaseHunk::DelRoot { name: _, inode: _ } => {
                changes
                    .entry(ROOT_FILE.to_string())
                    .or_default()
                    .insert(ChangedFileDiff::DelRoot);
            }
        }
    }
    changes

Replacement in crates/libflowers_client/src/cursor.rs at line 9 [3.26]
B:BD[4.1646] → [9.608:661]
```
    ChangedFile { ix: usize, path: Option<String> },
```
[4.1646]
[3.188]
```
    ChangedFile { ix: usize, path: String },
```
Deletion in crates/flowers_ui/src/main.rs at line 16 [12.2763]
B:BD[5.4614] → [6.4676:4708]
```
use std::collections::BTreeSet;
```

Replacement in crates/flowers_ui/src/main.rs at line 175 [12.2763]

B:BD[6.6621] → [6.6621:6701]

            let path = repo.changed_files.iter().nth(ix).unwrap().path.clone();

[6.6621]

[5.5061]

            let path = repo
                .changed_files
                .iter()
                .nth(ix)
                .map(|(k, _v)| k)
                .unwrap()
                .clone();

Replacement in crates/flowers_ui/src/main.rs at line 384 [12.2763]

B:BD[6.11860] → [6.11860:11911]

B:BD[6.11911] → [9.675:725]

∅:D[9.725] → [6.11955:12089]

B:BD[6.11955] → [6.11955:12089]

                    let file = repo::ChangedFile {
                        path: Some(path.clone()),
                        diff: repo::ChangedFileDiff::Add,
                    };
                    repo.changed_files.insert(file);

[6.11860]

[6.12089]

                    repo.changed_files
                        .entry(path.clone())
                        .or_default()
                        .insert(repo::ChangedFileDiff::Add);

Replacement in crates/flowers_ui/src/main.rs at line 410 [12.2763]

B:BD[6.12618] → [6.12618:12763]

                    let file = repo.changed_files.iter().nth(*ix).unwrap();
                    if let repo::ChangedFileDiff::Add = &file.diff {

[6.12618]

[7.4835]

                    let diffs = repo.changed_files.get(path).unwrap();
                    if diffs
                        .iter()
                        .any(|diff| matches!(diff, repo::ChangedFileDiff::Add))
                    {

Replacement in crates/flowers_ui/src/main.rs at line 418 [12.2763]

B:BD[7.4966] → [9.726:890]

                                path: path
                                    .clone()
                                    .expect("Added file must have a path"),

[7.4966]

[7.4967]

                                path: path.clone(),

Deletion in crates/flowers_ui/src/main.rs at line 422 [12.2763]
B:BD[6.12957] → [6.12957:13006]
```
                        let file = file.clone();
```

Replacement in crates/flowers_ui/src/main.rs at line 423 [12.2763]

B:BD[6.13059] → [6.13059:13131]

                        let removed = repo.changed_files.remove(&file);

[6.13059]

[6.13131]

                        let removed = repo.changed_files.remove(path);

Replacement in crates/flowers_ui/src/main.rs at line 425 [12.2763]

B:BD[6.13170] → [6.13170:13207]

                            removed,

[6.13170]

[6.13207]

                            removed.is_some(),

Replacement in crates/flowers_ui/src/main.rs at line 427 [12.2763]

B:BD[6.13261] → [6.13261:13314]

                            file, repo.changed_files

[6.13261]

[6.13314]

                            path,
                            repo.changed_files

Replacement in crates/flowers_ui/src/main.rs at line 431 [12.2763]

B:BD[6.13391] → [9.891:1046]

                        if let Some(file_path) = file.path {
                            repo.untracked_files.insert(file_path);
                        }

[6.13391]

[6.13455]

                        repo.untracked_files.insert(path.clone());

Replacement in crates/flowers_ui/src/main.rs at line 499 [12.2763]

B:BD[6.14598] → [6.14598:14639]

                        BTreeSet::new();

[6.14598]

[7.5329]

                        repo::ChangedFiles::default();

Replacement in crates/flowers_ui/src/main.rs at line 649 [12.2763]

B:BD[6.16155] → [6.16155:16379]

                        .find(|(_ix, file)| &file.path == path)
                        .map(|(ix, file)| cursor::Selection::ChangedFile {
                            ix,
                            path: file.path.clone(),

[6.16155]

[6.16379]

                        .find(|(_ix, (file_path, _diffs))| file_path == &path)
                        .map(|(ix, (file_path, _diffs))| {
                            cursor::Selection::ChangedFile {
                                ix,
                                path: file_path.clone(),
                            }

Replacement in crates/flowers_ui/src/main.rs at line 740 [12.2763]
∅:D[8.2707] → [5.7599:7626]
∅:D[6.17039] → [5.7599:7626]
B:BD[3.3633] → [5.7599:7626]
```
            |(ix, file)| {
```
[8.2707]
[3.3660]
```
            |(ix, (file_path, _diffs))| {
```

Replacement in crates/flowers_ui/src/main.rs at line 746 [12.2763]

B:BD[9.1075] → [9.1075:1307]

                        match &file.path {
                            Some(file_path) => text(format!("{}: {}", file.diff, file_path)),
                            None => text(format!("{}", file.diff)),
                        })

[9.1075]

[3.3911]

                text(format!("{}", file_path)))

Replacement in crates/flowers_ui/src/main.rs at line 748 [12.2763]

B:BD[3.3968] → [5.7702:7791]

                            cursor::Selection::ChangedFile{ix, path: file.path.clone()},

[3.3968]

[3.4025]

                            cursor::Selection::ChangedFile{ix, path: file_path.clone()},

Deletion in crates/flowers_ui/src/main.rs at line 791 [12.2763]

B:BD[11.170] → [11.170:329]

                let path = if let Some(path) = path {
                    path.as_str()
                } else {
                    "root"
                };