heddle-cli 0.4.0

An AI-native version control system
Documentation 
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

// SPDX-License-Identifier: Apache-2.0
//! Merge algorithms: ancestor finding, three-way merge, tree application.

mod apply;
mod engine;
mod executor;

use objects::object::Tree;

/// Result of a three-way merge, including rename information.
pub(crate) struct MergeResult {
    pub tree: Tree,
    pub conflicts: Vec<String>,
    /// Detected file renames: (from_path, to_path, similarity score).
    pub renames: Vec<(String, String, f64)>,
    /// Detected directory renames: (from_dir, to_dir).
    pub directory_renames: Vec<(String, String)>,
}

#[derive(Clone, Copy)]
pub(crate) struct ConflictLabels<'a> {
    pub current: &'a str,
    pub incoming: &'a str,
    /// Content-merge strategy. `HunkOnly` keeps the historical behaviour —
    /// every blob goes through `heddle-merge::text_hunk_merge`. `Semantic`
    /// routes parseable source through the AST-aware driver in
    /// `heddle-semantic::merge_driver`, falling back to `text_hunk_merge`
    /// on unknown / unparseable files.
    pub strategy: MergeStrategy,
}

#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub(crate) enum MergeStrategy {
    HunkOnly,
    Semantic,
}

impl ConflictLabels<'_> {
    pub(crate) const DEFAULT: ConflictLabels<'static> = ConflictLabels {
        current: "CURRENT",
        incoming: "INCOMING",
        strategy: MergeStrategy::HunkOnly,
    };
}

pub(crate) use apply::apply_merged_tree;
pub(crate) use engine::{three_way_merge, three_way_merge_with_labels};