laumann/pijul-conflicts - Change DF2KXDEK7B5ADHJYG7RUAZPTHUVUOLCLQLUUUIZP2OMJRRAKJJIQC

add run() function, clean up unwrap()s

Add a little more structure to the code, introduce a run() function returning a Result, so we can use ? instead of .unwrap() in a few places.

Put the printing of identified conflicts into its own function, I expect that it'll grow much larger.

Created by laumann on June 15, 2023

DF2KXDEK7B5ADHJYG7RUAZPTHUVUOLCLQLUUUIZP2OMJRRAKJJIQC

Dependencies

In channels

main

Change contents

Replacement in src/main.rs at line 1 [4.3996]

B:BD[4.3996] → [5.0:113]

//! Kinda like "pijul reset" but instead of overwriting the working
//! copy, we get a list of all the conflicts

[4.3996]

[5.113]

//! Like "pijul reset" but instead of overwriting the working copy, we
//! get a list of all the conflicts

Insertion in src/main.rs at line 6 [4.3996]
[5.222]
[4.3997]
```
use libpijul::Conflict;
```
Replacement in src/main.rs at line 8 [4.3996]
B:BD[4.4037] → [4.4037:4065]
```
use repository::Repository;
```
[4.4037]
[4.4065]
```
use anyhow::bail;
use std::io::Write;
```
Insertion in src/main.rs at line 13 [4.3996]
[4.4066]
[4.4066]
```
use repository::Repository;
```

Insertion in src/main.rs at line 52 [4.3996]

[5.1428]

    }
}
fn print_conflicts(conflicts: Vec<Conflict>) {
    println!("");
    println!("Conflicts");
    for c in &conflicts {
        let conflict_type = conflict_type(c);
        let path = conflict_path(c);
        println!("  {} {}", conflict_type, path);

Replacement in src/main.rs at line 65 [4.3996]

∅:D[5.1437] → [4.4083:4202]

B:BD[4.4083] → [4.4083:4202]

fn main() {
    let repo = Repository::find_root(None).unwrap();
    let txn = repo.pristine.arc_txn_begin().unwrap();

[5.1437]

[4.4202]

fn run() -> Result<(), anyhow::Error> {
    let repo = Repository::find_root(None)?;
    let txn = repo.pristine.arc_txn_begin()?;

Replacement in src/main.rs at line 69 [4.3996]

B:BD[4.4203] → [5.1438:1483]

∅:D[5.1483] → [4.4203:4276]

B:BD[4.4203] → [4.4203:4276]

    let fake_working_copy = FakeWorkingCopy;
    let cur_channel = txn.read().current_channel().unwrap().to_string();

[4.4203]

[4.4276]

    let cur_channel = txn.read().current_channel().unwrap_or("main").to_string();

Replacement in src/main.rs at line 72 [4.3996]

B:BD[5.1485] → [5.1485:1560]

    let channel = txn.read().load_channel(&cur_channel).unwrap().unwrap();

[5.1485]

[6.64]

    let channel = if let Some(channel) = txn.read().load_channel(&cur_channel)? {
        channel
    } else {
        bail!("No such channel: {}", cur_channel);
    };

Replacement in src/main.rs at line 78 [4.3996]

B:BD[6.100] → [6.100:425]

B:BD[6.425] → [3.0:39]

    conflicts.extend(
        libpijul::output::output_repository_no_pending(
            &fake_working_copy,
            &repo.changes,
            &txn,
            &channel,
            "",   // prefix?
            true, //
            None,
            num_cpus::get(),
            0,
        )
        .unwrap(),
    );
    if conflicts.is_empty() {
	return;

[6.100]

[3.39]

    conflicts.extend(libpijul::output::output_repository_no_pending(
        &FakeWorkingCopy,
        &repo.changes,
        &txn,
        &channel,
        "",   // prefix?
        true, //
        None,
        num_cpus::get(),
        0,
    )?);
    if !conflicts.is_empty() {
        print_conflicts(conflicts);

Replacement in src/main.rs at line 92 [4.3996]

B:BD[3.45] → [3.45:234]

    println!("");
    println!("Conflicts");
    for c in &conflicts {
	let conflict_type = conflict_type(c);
	let path = conflict_path(c);
	println!("  {} {}", conflict_type, path);
    }

[3.45]

[3.234]

    Ok(())

Replacement in src/main.rs at line 95 [4.3996]

B:BD[3.237] → [3.237:261]

use libpijul::Conflict;

[3.237]

[3.261]

fn main() {
    std::process::exit(if let Err(e) = run() {
        writeln!(std::io::stderr(), "fatal: {}", e);
        1
    } else {
        0
    });
}

Replacement in src/main.rs at line 106 [4.3996]

B:BD[3.339] → [3.339:432]

	Conflict::Name { .. } => "name",
	Conflict::Order { .. } => "order",
	_ => unimplemented!()

[3.339]

[3.432]

        Conflict::Name { .. } => "name",
        Conflict::Order { .. } => "order",
        _ => unimplemented!(),

Replacement in src/main.rs at line 114 [4.3996]

B:BD[3.510] → [3.510:610]

	Conflict::Name { path, .. } => path,
	Conflict::Order { path, .. } => path,
	_ => unimplemented!()

[3.510]

[3.610]

        Conflict::Name { path, .. } => path,
        Conflict::Order { path, .. } => path,
        _ => unimplemented!(),

Replacement in README.md at line 26 [8.34]

B:BD[7.559] → [2.376:633]

[Order { path: "file.txt", inode_vertex: [Position { change: ChangeId(XEV3C5VQ6YGEO), pos: ChangePosition(L64(1)) }], line: 2, changes: [YNHLT3DHY7YAIAUM4LH2O4DPZURDPHH6FB5MVPANYMFZXLY47ABQC, LB3DIKQ2M7XPJBXB2FGR5U2APBQN7P7BN7A5OKXBGHGOMDFWEPPAC], id: 1 }]

[7.559]

[7.816]


Conflicts
  order file.txt

Deletion in README.md at line 43 [8.34]
B:BD[8.690] → [2.634:667]
```
 - Clean up all the `.unwrap()`s
```