weave-cli 0.2.6

Entity-level semantic merge CLI. Resolves conflicts at the function/class level instead of lines.
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85

use colored::Colorize;
use sem_core::parser::plugins::create_default_registry;
use weave_core::entity_merge_with_registry;
use weave_core::git;

pub fn run(
    branch: &str,
    file_path: Option<&str>,
) -> Result<(), Box<dyn std::error::Error>> {
    let head = "HEAD";
    let merge_base = git::find_merge_base(head, branch)?;

    let files = if let Some(fp) = file_path {
        vec![fp.to_string()]
    } else {
        git::get_changed_files(&merge_base, head, branch)?
    };

    if files.is_empty() {
        println!("{} No files with changes in both branches.", "✓".green().bold());
        return Ok(());
    }

    let registry = create_default_registry();
    let mut total_conflicts = 0;
    let mut total_auto_resolved = 0;

    for file in &files {
        let base_content = git::git_show(&merge_base, file).unwrap_or_default();
        let ours_content = git::git_show(head, file).unwrap_or_default();
        let theirs_content = git::git_show(branch, file).unwrap_or_default();

        if ours_content == theirs_content || base_content == ours_content || base_content == theirs_content {
            continue;
        }

        let result = entity_merge_with_registry(
            &base_content,
            &ours_content,
            &theirs_content,
            file,
            &registry,
            &weave_core::MarkerFormat::default(),
        );

        let status = if result.is_clean() {
            total_auto_resolved += 1;
            format!("{}", "auto-resolved".green())
        } else {
            total_conflicts += result.conflicts.len();
            format!("{} conflict(s)", result.conflicts.len().to_string().red().bold())
        };

        println!("  {} — {}", file, status);
        println!("    {}", result.stats);

        for conflict in &result.conflicts {
            println!(
                "    {} {} `{}`: {}",
                "✗".red(),
                conflict.entity_type,
                conflict.entity_name,
                conflict.kind
            );
        }
    }

    println!();
    if total_conflicts == 0 {
        println!(
            "{} Merge would be clean ({} file(s) auto-resolved by weave)",
            "✓".green().bold(),
            total_auto_resolved
        );
    } else {
        println!(
            "{} Merge would have {} entity-level conflict(s) ({} file(s) auto-resolved)",
            "✗".red().bold(),
            total_conflicts,
            total_auto_resolved
        );
    }

    Ok(())
}