pasejo 2026.4.19

passage re-implementation in Rust for teams
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

// SPDX-FileCopyrightText: The pasejo Authors
// SPDX-License-Identifier: 0BSD

use crate::cli;
use anyhow::Result;
use std::collections::BTreeMap;

pub fn three_way_merge_map<T>(
    common_ancestor: &BTreeMap<String, T>,
    current_version: &BTreeMap<String, T>,
    other_version: &BTreeMap<String, T>,
    value_type: &str,
) -> Result<BTreeMap<String, T>>
where
    T: Clone + PartialEq,
{
    let mut merged_map = BTreeMap::new();
    let mut merge_conflict = false;

    for (key, value) in common_ancestor {
        let current_value = current_version.get(key);
        let other_value = other_version.get(key);

        if let (Some(current_value), Some(other_value)) = (current_value, other_value) {
            if current_value == other_value {
                merged_map.insert(key.clone(), current_value.clone());
            } else if current_value == value {
                merged_map.insert(key.clone(), other_value.clone());
            } else if other_value == value {
                merged_map.insert(key.clone(), current_value.clone());
            } else {
                merge_conflict = true;
                cli::logs::merge_conflict_values(value_type, key);
            }
        } else if let Some(current_value) = current_value {
            if value != current_value {
                merge_conflict = true;
                cli::logs::merge_conflict_removed_and_modified(value_type, key);
            }
        } else if let Some(other_value) = other_value
            && value != other_value
        {
            merge_conflict = true;
            cli::logs::merge_conflict_removed_and_modified(value_type, key);
        }
    }

    for (key, value) in current_version {
        if !common_ancestor.contains_key(key) {
            merged_map.insert(key.clone(), value.clone());
        }
    }

    for (key, value) in other_version {
        if !common_ancestor.contains_key(key) {
            let already_added_value = merged_map.get(key);

            if let Some(already_added_value) = already_added_value {
                if already_added_value != value {
                    merge_conflict = true;
                    cli::logs::merge_conflict_values(value_type, key);
                }
            } else {
                merged_map.insert(key.clone(), value.clone());
            }
        }
    }

    if merge_conflict {
        Err(anyhow::anyhow!(
            "Merge conflict detected in {value_type}s. Please resolve manually."
        ))
    } else {
        Ok(merged_map)
    }
}