pijul/pijul - Change AGTMM5U7XETFXBBS6CXIOXRQ7CDWQWVR62TR3QPI6LMVAK4J3HEQC

More informative diff --short

Created by pmeunier on July 21, 2021

AGTMM5U7XETFXBBS6CXIOXRQ7CDWQWVR62TR3QPI6LMVAK4J3HEQC

Dependencies

In channels

main

In discussions

#345 [Feature request] More informative and prettier `pijul diff --short`

Change contents

Replacement in pijul/src/commands/diff.rs at line 145 [4.173551]

B:BD[3.81] → [3.81:123]

            let mut changes = Vec::new();

[3.81]

[3.123]

            let mut changes = BTreeMap::new();

Replacement in pijul/src/commands/diff.rs at line 147 [4.173551]

B:BD[3.169] → [3.169:209]

B:BD[3.209] → [5.825:1300]

                changes.push(match ch {
                    Hunk::FileMove { path, .. } => format!("MV {}\n", path),
                    Hunk::FileDel { path, .. } => format!("D  {}\n", path),
                    Hunk::FileUndel { path, .. } => format!("UD {}\n", path),
                    Hunk::FileAdd { path, .. } => format!("A  {}", path),
                    Hunk::SolveNameConflict { path, .. } => format!("SC {}", path),
                    Hunk::UnsolveNameConflict { path, .. } => format!("UC {}", path),

[3.169]

[5.1300]

                use std::fmt::Write;
                match ch {
                    Hunk::FileMove { path, .. } => {
                        write!(changes.entry(path).or_insert(String::new()), "MV,")?
                    }
                    Hunk::FileDel { path, .. } => {
                        write!(changes.entry(path).or_insert(String::new()), "D,")?
                    }
                    Hunk::FileUndel { path, .. } => {
                        write!(changes.entry(path).or_insert(String::new()), "UD,")?
                    }
                    Hunk::FileAdd { path, .. } => {
                        write!(changes.entry(path).or_insert(String::new()), "A,")?
                    }
                    Hunk::SolveNameConflict { path, .. } => {
                        write!(changes.entry(path).or_insert(String::new()), "SC,")?
                    }
                    Hunk::UnsolveNameConflict { path, .. } => {
                        write!(changes.entry(path).or_insert(String::new()), "UC,")?
                    }

Replacement in pijul/src/commands/diff.rs at line 170 [4.173551]

B:BD[6.4812] → [6.4812:4861]

                    } => format!("M  {}", path),

[6.4812]

[5.1334]

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

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

B:BD[6.4981] → [6.4981:5030]

                    } => format!("R  {}", path),

[6.4981]

[5.1375]

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

Replacement in pijul/src/commands/diff.rs at line 178 [4.173551]

B:BD[6.5157] → [6.5157:5206]

                    } => format!("SC {}", path),

[6.5157]

[5.1423]

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

Replacement in pijul/src/commands/diff.rs at line 182 [4.173551]

B:BD[6.5335] → [6.5335:5384]

                    } => format!("UC {}", path),

[6.5335]

[5.1473]

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

Replacement in pijul/src/commands/diff.rs at line 186 [4.173551]

B:BD[6.5509] → [6.5509:5558]

∅:D[6.5558] → [3.1479:1499]

B:BD[3.1479] → [3.1479:1499]

                    } => format!("RZ {}", path),
                });

[6.5509]

[3.1499]

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

Replacement in pijul/src/commands/diff.rs at line 189 [4.173551]

B:BD[3.1513] → [3.1513:1579]

B:BD[3.1579] → [6.5559:5591]

B:BD[6.5591] → [7.0:45]

            changes.sort_unstable();
            changes.dedup();
            for ch in changes {
                writeln!(stdout, "{}", ch)?;

[3.1513]

[2.1885]

            let al = changes.iter().map(|(_, v)| v.len()).max().unwrap_or(0);
            let spaces: String = std::iter::repeat(' ').take(al).collect();
            for (k, v) in changes {
                let (sp, _) = spaces.split_at(al - v.len());
                writeln!(stdout, "{}{} {}", v.trim_end_matches(','), sp, k)?;