jcdickinson/pijul - Change OQQ4TGEMWDB6JXZ4H4D2XQJE3PDLINTZ4YCL2O2EVG67CDSAM35AC

Printing modifications only once in pijul diff

Created by pmeunier on July 21, 2021

OQQ4TGEMWDB6JXZ4H4D2XQJE3PDLINTZ4YCL2O2EVG67CDSAM35AC

Dependencies

In channels

main

Change contents

Replacement in pijul/src/commands/diff.rs at line 1 [3.173551]
B:BD[3.173662] → [3.173662:173694]
```
use std::collections::BTreeMap;
```
[3.173551]
[3.173694]
```
use std::collections::{BTreeMap, BTreeSet};
```
Deletion in pijul/src/commands/diff.rs at line 157 [3.173551]
B:BD[4.169] → [2.48:85]
```
                use std::fmt::Write;
```

Replacement in pijul/src/commands/diff.rs at line 159 [3.173551]

B:BD[2.165] → [2.165:250]

                        write!(changes.entry(path).or_insert(String::new()), "MV,")?

[2.165]

[2.250]

                        changes.entry(path).or_insert(BTreeSet::new()).insert("MV")

Replacement in pijul/src/commands/diff.rs at line 162 [3.173551]

B:BD[2.324] → [2.324:408]

                        write!(changes.entry(path).or_insert(String::new()), "D,")?

[2.324]

[2.408]

                        changes.entry(path).or_insert(BTreeSet::new()).insert("D")

Replacement in pijul/src/commands/diff.rs at line 165 [3.173551]

B:BD[2.484] → [2.484:569]

                        write!(changes.entry(path).or_insert(String::new()), "UD,")?

[2.484]

[2.569]

                        changes.entry(path).or_insert(BTreeSet::new()).insert("UD")

Replacement in pijul/src/commands/diff.rs at line 168 [3.173551]

B:BD[2.643] → [2.643:727]

                        write!(changes.entry(path).or_insert(String::new()), "A,")?

[2.643]

[2.727]

                        changes.entry(path).or_insert(BTreeSet::new()).insert("A")

Replacement in pijul/src/commands/diff.rs at line 171 [3.173551]

B:BD[2.811] → [2.811:896]

                        write!(changes.entry(path).or_insert(String::new()), "SC,")?

[2.811]

[2.896]

                        changes.entry(path).or_insert(BTreeSet::new()).insert("SC")

Replacement in pijul/src/commands/diff.rs at line 174 [3.173551]

B:BD[2.982] → [2.982:1067]

                        write!(changes.entry(path).or_insert(String::new()), "UC,")?

[2.982]

[2.1067]

                        changes.entry(path).or_insert(BTreeSet::new()).insert("UC")

Replacement in pijul/src/commands/diff.rs at line 179 [3.173551]

B:BD[5.4812] → [2.1090:1176]

                    } => write!(changes.entry(path).or_insert(String::new()), "M,")?,

[5.4812]

[6.1334]

                    } => changes.entry(path).or_insert(BTreeSet::new()).insert("M"),

Replacement in pijul/src/commands/diff.rs at line 183 [3.173551]

B:BD[5.4981] → [2.1177:1263]

                    } => write!(changes.entry(path).or_insert(String::new()), "R,")?,

[5.4981]

[6.1375]

                    } => changes.entry(path).or_insert(BTreeSet::new()).insert("R"),

Replacement in pijul/src/commands/diff.rs at line 187 [3.173551]

B:BD[5.5157] → [2.1264:1351]

                    } => write!(changes.entry(path).or_insert(String::new()), "SC,")?,

[5.5157]

[6.1423]

                    } => changes.entry(path).or_insert(BTreeSet::new()).insert("SC"),

Replacement in pijul/src/commands/diff.rs at line 191 [3.173551]

B:BD[5.5335] → [2.1352:1439]

                    } => write!(changes.entry(path).or_insert(String::new()), "SC,")?,

[5.5335]

[6.1473]

                    } => changes.entry(path).or_insert(BTreeSet::new()).insert("SC"),

Replacement in pijul/src/commands/diff.rs at line 195 [3.173551]

B:BD[5.5509] → [2.1440:1545]

                    } => write!(changes.entry(path).or_insert(String::new()), "RZ,")?,
                }

[5.5509]

[4.1499]

                    } => changes.entry(path).or_insert(BTreeSet::new()).insert("RZ"),
                };

Replacement in pijul/src/commands/diff.rs at line 198 [3.173551]

B:BD[4.1513] → [2.1546:1624]

            let al = changes.iter().map(|(_, v)| v.len()).max().unwrap_or(0);

[4.1513]

[2.1624]

            let al = changes
                .iter()
                .map(|(_, v)| v.iter().map(|x| x.len()).sum::<usize>() + v.len() - 1)
                .max()
                .unwrap_or(0);

Replacement in pijul/src/commands/diff.rs at line 204 [3.173551]

B:BD[2.1700] → [2.1700:1736]

            for (k, v) in changes {

[2.1700]

[2.1736]

            for (k, v) in changes.iter() {
                let mut is_first = true;
                for v in v.iter() {
                    if is_first {
                        write!(stdout, "{}", v)?;
                    } else {
                        write!(stdout, ",{}", v)?;
                    }
                    is_first = false;
                }

Replacement in pijul/src/commands/diff.rs at line 215 [3.173551]

B:BD[2.1797] → [2.1797:1875]

                writeln!(stdout, "{}{} {}", v.trim_end_matches(','), sp, k)?;

[2.1797]

[7.1885]

                writeln!(stdout, "{} {}", sp, k)?;