laumann/pijul - Change V6J6DTJCGVYSL5W7NVSRP5ROIUWTMZW2MBYO7UBZFCUEJQO3ADWQC

Do not compute the entire diff if all we want is --json --untracked

Created by pmeunier on July 21, 2021

V6J6DTJCGVYSL5W7NVSRP5ROIUWTMZW2MBYO7UBZFCUEJQO3ADWQC

Dependencies

In channels

main

Change contents

Insertion in pijul/src/commands/diff.rs at line 42 [4.173551]

[4.174275]

[2.16050]


        if self.untracked && self.json {
            let txn = txn.read();
            serde_json::to_writer_pretty(
                &mut std::io::stdout(),
                &untracked(&repo, &*txn)?.collect::<Vec<_>>(),
            )?;
            writeln!(stdout)?;
            return Ok(());
        }

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

B:BD[4.175800] → [3.203:1884]

            if self.untracked {
                serde_json::to_writer_pretty(
                    &mut std::io::stdout(),
                    &untracked(&repo, &*txn)?.collect::<Vec<_>>(),
                )?;
                writeln!(stdout)?;
            } else {
                let mut changes = BTreeMap::new();
                for ch in change.changes.iter() {
                    changes
                        .entry(ch.path())
                        .or_insert_with(Vec::new)
                        .push(Status {
                            operation: match ch {
                                Hunk::FileMove { .. } => "file move",
                                Hunk::FileDel { .. } => "file del",
                                Hunk::FileUndel { .. } => "file undel",
                                Hunk::SolveNameConflict { .. } => "solve name conflict",
                                Hunk::UnsolveNameConflict { .. } => "unsolve name conflict",
                                Hunk::FileAdd { .. } => "file add",
                                Hunk::Edit { .. } => "edit",
                                Hunk::Replacement { .. } => "replacement",
                                Hunk::SolveOrderConflict { .. } => "solve order conflict",
                                Hunk::UnsolveOrderConflict { .. } => "unsolve order conflict",
                                Hunk::ResurrectZombies { .. } => "resurrect zombies",
                            },
                            line: ch.line(),
                        });
                }
                serde_json::to_writer_pretty(&mut std::io::stdout(), &changes)?;
                writeln!(stdout)?;

[4.175800]

[4.176894]

            let mut changes = BTreeMap::new();
            for ch in change.changes.iter() {
                changes
                    .entry(ch.path())
                    .or_insert_with(Vec::new)
                    .push(Status {
                        operation: match ch {
                            Hunk::FileMove { .. } => "file move",
                            Hunk::FileDel { .. } => "file del",
                            Hunk::FileUndel { .. } => "file undel",
                            Hunk::SolveNameConflict { .. } => "solve name conflict",
                            Hunk::UnsolveNameConflict { .. } => "unsolve name conflict",
                            Hunk::FileAdd { .. } => "file add",
                            Hunk::Edit { .. } => "edit",
                            Hunk::Replacement { .. } => "replacement",
                            Hunk::SolveOrderConflict { .. } => "solve order conflict",
                            Hunk::UnsolveOrderConflict { .. } => "unsolve order conflict",
                            Hunk::ResurrectZombies { .. } => "resurrect zombies",
                        },
                        line: ch.line(),
                    });

Insertion in pijul/src/commands/diff.rs at line 155 [4.173551]

[4.176908]

[5.50]

            serde_json::to_writer_pretty(&mut std::io::stdout(), &changes)?;
            writeln!(stdout)?;