mx00s/pijul - Change C4MJ7D7QCOFGIHQSDV3UC76DTSE5M7JSLGN5MROMSVKFVQRFSP5QC

Verbose printing of conflicts to stderr

Created by pmeunier on August 3, 2021

C4MJ7D7QCOFGIHQSDV3UC76DTSE5M7JSLGN5MROMSVKFVQRFSP5QC

Dependencies

In channels

main

Change contents

Insertion in pijul/src/commands/reset.rs at line 128 [5.97650]
[4.8180]
[4.8180]
```
        let mut conflicts = Vec::new();
```

Replacement in pijul/src/commands/reset.rs at line 188 [5.97650]

B:BD[4.10659] → [4.10659:10723]

B:BD[4.10723] → [3.4704:4744]

∅:D[3.4744] → [4.10770:10805]

B:BD[4.10770] → [4.10770:10805]

B:BD[4.10805] → [3.4745:4801]

∅:D[3.4801] → [4.10875:10991]

B:BD[4.10875] → [4.10875:10991]

B:BD[4.10991] → [6.318:341]

∅:D[6.341] → [4.10991:11011]

B:BD[4.10991] → [4.10991:11011]

                libpijul::output::output_repository_no_pending(
                    &repo.working_copy,
                    &repo.changes,
                    &txn,
                    &channel,
                    &path,
                    true,
                    None,
                    num_cpus::get(),
                    0,
                )?;

[4.10659]

[4.11011]

                conflicts.extend(
                    libpijul::output::output_repository_no_pending(
                        &repo.working_copy,
                        &repo.changes,
                        &txn,
                        &channel,
                        &path,
                        true,
                        None,
                        num_cpus::get(),
                        0,
                    )?
                    .into_iter(),
                );

Replacement in pijul/src/commands/reset.rs at line 204 [5.97650]

B:BD[4.11059] → [4.11059:11123]

B:BD[4.11123] → [3.4802:4842]

∅:D[3.4842] → [4.11162:11197]

B:BD[4.11162] → [4.11162:11197]

B:BD[4.11197] → [3.4843:4899]

∅:D[3.4899] → [4.11259:11372]

B:BD[4.11259] → [4.11259:11372]

B:BD[4.11372] → [6.342:365]

∅:D[6.365] → [4.11372:11392]

B:BD[4.11372] → [4.11372:11392]

                libpijul::output::output_repository_no_pending(
                    &repo.working_copy,
                    &repo.changes,
                    &txn,
                    &channel,
                    "",
                    true,
                    None,
                    num_cpus::get(),
                    0,
                )?;

[4.11059]

[4.11392]

                conflicts.extend(
                    libpijul::output::output_repository_no_pending(
                        &repo.working_copy,
                        &repo.changes,
                        &txn,
                        &channel,
                        "",
                        true,
                        None,
                        num_cpus::get(),
                        0,
                    )?
                    .into_iter(),
                );

Replacement in pijul/src/commands/reset.rs at line 233 [5.97650]

∅:D[7.452] → [4.11865:11929]

B:BD[4.11865] → [4.11865:11929]

B:BD[4.11929] → [3.4900:4940]

∅:D[3.4940] → [4.11976:12011]

B:BD[4.11976] → [4.11976:12011]

B:BD[4.12011] → [3.4941:4997]

∅:D[3.4997] → [4.12081:12197]

B:BD[4.12081] → [4.12081:12197]

B:BD[4.12197] → [6.366:389]

∅:D[6.389] → [4.12197:12217]

B:BD[4.12197] → [4.12197:12217]

                libpijul::output::output_repository_no_pending(
                    &repo.working_copy,
                    &repo.changes,
                    &txn,
                    &channel,
                    &path,
                    true,
                    None,
                    num_cpus::get(),
                    0,
                )?;

[7.452]

[5.101673]

                conflicts.extend(
                    libpijul::output::output_repository_no_pending(
                        &repo.working_copy,
                        &repo.changes,
                        &txn,
                        &channel,
                        &path,
                        true,
                        None,
                        num_cpus::get(),
                        0,
                    )?
                    .into_iter(),
                );

Insertion in pijul/src/commands/reset.rs at line 250 [5.97650]
[5.101723]
[4.12399]
```
        super::print_conflicts(&conflicts)?;
```
Insertion in pijul/src/commands/pushpull.rs at line 532 [5.111631]
[8.5070]
[9.11126]
```
            super::print_conflicts(&conflicts)?;
```

Insertion in pijul/src/commands/mod.rs at line 296 [5.133619]

[2.1046]

[10.5215]

}
use libpijul::Conflict;
fn print_conflicts(conflicts: &[Conflict]) -> Result<(), std::io::Error> {
    if conflicts.is_empty() {
        return Ok(());
    }
    let mut w = termcolor::StandardStream::stderr(termcolor::ColorChoice::Auto);
    use std::io::Write;
    use termcolor::*;
    w.set_color(ColorSpec::new().set_fg(Some(Color::Red)))?;
    writeln!(w, "\nThere were conflicts:\n")?;
    w.set_color(ColorSpec::new().set_fg(None))?;
    for c in conflicts.iter() {
        match c {
            Conflict::Name { ref path } => writeln!(w, "  - Name conflict on \"{}\"", path)?,
            Conflict::ZombieFile { ref path } => {
                writeln!(w, "  - Path deletion conflict \"{}\"", path)?
            }
            Conflict::MultipleNames { ref path, .. } => {
                writeln!(w, "  - File has multiple names: \"{}\"", path)?
            }
            Conflict::Zombie { ref path, ref line } => writeln!(
                w,
                "  - Deletion conflict in \"{}\" starting on line {}",
                path, line
            )?,
            Conflict::Cyclic { ref path, ref line } => writeln!(
                w,
                "  - Cycle conflict in \"{}\" starting on line {}",
                path, line
            )?,
            Conflict::Order { ref path, ref line } => writeln!(
                w,
                "  - Order conflict in \"{}\" starting on line {}",
                path, line
            )?,
        }
    }
    Ok(())

Deletion in pijul/src/commands/archive.rs at line 1 [5.191083]
B:BD[5.191202] → [5.191202:191222]
```
use std::io::Write;
```

Replacement in pijul/src/commands/archive.rs at line 139 [5.191083]

B:BD[5.194024] → [5.194024:194244]

            if !conflicts.is_empty() {
                writeln!(
                    std::io::stderr(),
                    "There were {} conflicts",
                    conflicts.len()
                )?
            }

[5.194024]

[5.194244]

            super::print_conflicts(&conflicts)?;

Insertion in pijul/src/commands/apply.rs at line 128 [5.194289]
[8.5339]
[11.3383]
```
            let mut conflicts = Vec::new();
```

Replacement in pijul/src/commands/apply.rs at line 130 [5.194289]

B:BD[11.3430] → [4.23911:23975]

B:BD[4.23975] → [3.18455:18495]

∅:D[3.18495] → [11.3524:3559]

∅:D[4.24022] → [11.3524:3559]

B:BD[11.3524] → [11.3524:3559]

B:BD[11.3559] → [3.18496:18552]

∅:D[3.18552] → [11.3593:3672]

∅:D[4.24093] → [11.3593:3672]

B:BD[11.3593] → [11.3593:3672]

B:BD[11.3672] → [4.24094:24131]

B:BD[4.24131] → [6.1653:1676]

∅:D[6.1676] → [11.3672:3692]

∅:D[4.24131] → [11.3672:3692]

B:BD[11.3672] → [11.3672:3692]

                libpijul::output::output_repository_no_pending(
                    &repo.working_copy,
                    &repo.changes,
                    &txn,
                    &channel,
                    &path,
                    true,
                    None,
                    num_cpus::get(),
                    0,
                )?;

[11.3430]

[11.3692]

                conflicts.extend(
                    libpijul::output::output_repository_no_pending(
                        &repo.working_copy,
                        &repo.changes,
                        &txn,
                        &channel,
                        &path,
                        true,
                        None,
                        num_cpus::get(),
                        0,
                    )?
                    .into_iter(),
                );

Replacement in pijul/src/commands/apply.rs at line 146 [5.194289]

B:BD[11.3749] → [4.24132:24196]

B:BD[4.24196] → [3.18553:18593]

∅:D[3.18593] → [11.3843:3878]

∅:D[4.24243] → [11.3843:3878]

B:BD[11.3843] → [11.3843:3878]

B:BD[11.3878] → [3.18594:18650]

∅:D[3.18650] → [11.3912:3988]

∅:D[4.24314] → [11.3912:3988]

B:BD[11.3912] → [11.3912:3988]

B:BD[11.3988] → [4.24315:24352]

B:BD[4.24352] → [6.1677:1700]

∅:D[6.1700] → [11.3988:4008]

∅:D[4.24352] → [11.3988:4008]

B:BD[11.3988] → [11.3988:4008]

                libpijul::output::output_repository_no_pending(
                    &repo.working_copy,
                    &repo.changes,
                    &txn,
                    &channel,
                    "",
                    true,
                    None,
                    num_cpus::get(),
                    0,
                )?;

[11.3749]

[12.1628]

                conflicts.extend(
                    libpijul::output::output_repository_no_pending(
                        &repo.working_copy,
                        &repo.changes,
                        &txn,
                        &channel,
                        "",
                        true,
                        None,
                        num_cpus::get(),
                        0,
                    )?
                    .into_iter(),
                );

Insertion in pijul/src/commands/apply.rs at line 162 [5.194289]
[8.5369]
[12.1642]
```
            super::print_conflicts(&conflicts)?;
```

Replacement in libpijul/src/output/output.rs at line 19 [5.671807]

B:BD[5.672521] → [5.672521:672753]

    Name { path: String },
    ZombieFile { path: String },
    MultipleNames { pos: Position<ChangeId> },
    Zombie { path: String, line: usize },
    Cyclic { path: String, line: usize },
    Order { path: String, line: usize },

[5.672521]

[5.672753]

    Name {
        path: String,
    },
    ZombieFile {
        path: String,
    },
    MultipleNames {
        pos: Position<ChangeId>,
        path: String,
    },
    Zombie {
        path: String,
        line: usize,
    },
    Cyclic {
        path: String,
        line: usize,
    },
    Order {
        path: String,
        line: usize,
    },

Replacement in libpijul/src/output/output.rs at line 204 [5.671807]

B:BD[4.77359] → [4.77359:77407]

    let mut done_vertices = HashMap::default();

[4.77359]

[5.674695]

    let mut done_vertices: HashMap<_, (Vertex<ChangeId>, String)> = HashMap::default();

Replacement in libpijul/src/output/output.rs at line 229 [5.671807]

B:BD[5.675559] → [13.1271:1332]

                match done_vertices.entry(output_item.pos) {

[5.675559]

[5.675611]

                let name_entry = match done_vertices.entry(output_item.pos) {

Replacement in libpijul/src/output/output.rs at line 232 [5.671807]

B:BD[5.675741] → [5.675741:675791]

                        if *e.get() != name_key {

[5.675741]

[5.675791]

                        if e.get().0 != name_key {

Insertion in libpijul/src/output/output.rs at line 235 [5.671807]

[5.675914]

                                path: e.get().1.clone(),

Replacement in libpijul/src/output/output.rs at line 240 [5.671807]

B:BD[5.676028] → [5.676028:676154]

                    Entry::Vacant(e) => {
                        e.insert(name_key);
                    }
                }

[5.676028]

[14.82271]

                    Entry::Vacant(e) => e,
                };

Insertion in libpijul/src/output/output.rs at line 276 [5.671807]

[5.677226]

[15.432]


                name_entry.insert((name_key, output_item.path.clone()));

Replacement in libpijul/src/output/archive.rs at line 163 [5.690044]

B:BD[5.692788] → [4.83251:83290]

    let mut done = HashMap::default();

[5.692788]

[4.83290]

    let mut done: HashMap<_, (Vertex<ChangeId>, String)> = HashMap::default();

Replacement in libpijul/src/output/archive.rs at line 182 [5.690044]

B:BD[5.693507] → [5.693507:693559]

                match done.entry(output_item.pos) {

[5.693507]

[5.693559]

                let name_entry = match done.entry(output_item.pos) {

Replacement in libpijul/src/output/archive.rs at line 185 [5.690044]

B:BD[5.693689] → [5.693689:693739]

                        if *e.get() != name_key {

[5.693689]

[5.693739]

                        if e.get().0 != name_key {

Insertion in libpijul/src/output/archive.rs at line 188 [5.690044]

[5.693862]

                                path: e.get().1.clone(),

Deletion in libpijul/src/output/archive.rs at line 192 [5.690044]

B:BD[5.693954] → [5.693954:694062]

                    }
                    Entry::Vacant(e) => {
                        e.insert(name_key);

Replacement in libpijul/src/output/archive.rs at line 193 [5.690044]

B:BD[5.694084] → [5.694084:694102]

[5.694084]

[14.88039]

                    Entry::Vacant(e) => e,
                };

Insertion in libpijul/src/output/archive.rs at line 210 [5.690044]

[5.694807]


                name_entry.insert((name_key, output_item.path.clone()));