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
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
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118

// SPDX-License-Identifier: Apache-2.0
use super::*;

#[test]
fn test_cherry_pick_conflict() {
    let temp = TempDir::new().unwrap();
    heddle(&["init"], Some(temp.path())).unwrap();

    fs::write(temp.path().join("file.txt"), "v1").unwrap();
    heddle(&["capture", "-m", "V1"], Some(temp.path())).unwrap();

    heddle(&["thread", "create", "feature"], Some(temp.path())).unwrap();
    heddle(&["thread", "switch", "feature"], Some(temp.path())).unwrap();
    fs::write(temp.path().join("file.txt"), "feature v2").unwrap();
    heddle(&["capture", "-m", "Feature V2"], Some(temp.path())).unwrap();

    heddle(&["thread", "switch", "main"], Some(temp.path())).unwrap();
    fs::write(temp.path().join("file.txt"), "main v2").unwrap();
    heddle(&["capture", "-m", "Main V2"], Some(temp.path())).unwrap();

    heddle(&["thread", "switch", "feature"], Some(temp.path())).unwrap();
    let log = heddle(&["log", "--oneline", "--output", "text"], Some(temp.path())).unwrap();
    let feature_commit = log
        .lines()
        .next()
        .unwrap()
        .split_whitespace()
        .next()
        .unwrap();

    heddle(&["thread", "switch", "main"], Some(temp.path())).unwrap();
    let result = heddle(&["cherry-pick", feature_commit], Some(temp.path()));

    assert!(result.is_ok() || result.unwrap_err().contains("conflict"));
}

#[test]
fn test_cherry_pick_already_applied() {
    let temp = TempDir::new().unwrap();
    heddle(&["init"], Some(temp.path())).unwrap();

    fs::write(temp.path().join("file.txt"), "original").unwrap();
    heddle(&["capture", "-m", "Original"], Some(temp.path())).unwrap();

    fs::write(temp.path().join("file.txt"), "modified").unwrap();
    heddle(&["capture", "-m", "Modified"], Some(temp.path())).unwrap();

    let log = heddle(&["log", "--oneline", "--output", "text"], Some(temp.path())).unwrap();
    let commit_id = log
        .lines()
        .next()
        .unwrap()
        .split_whitespace()
        .next()
        .unwrap();

    heddle(&["switch", "HEAD~1"], Some(temp.path())).unwrap();
    let result = heddle(&["cherry-pick", commit_id], Some(temp.path()));

    assert!(
        result.is_ok(),
        "should handle already-applied: {:?}",
        result.err()
    );
}

#[test]
fn test_cherry_pick_nonexistent_commit() {
    let temp = TempDir::new().unwrap();
    setup_repo_with_file(&temp, "file.txt", "content");

    let result = heddle(&["cherry-pick", "hd-deadbeef1234"], Some(temp.path()));
    assert!(result.is_err(), "should fail for nonexistent commit");
}

#[test]
fn test_cherry_pick_multiple_commits() {
    let temp = TempDir::new().unwrap();
    heddle(&["init"], Some(temp.path())).unwrap();

    for i in 1..=3 {
        fs::write(
            temp.path().join(format!("file{}.txt", i)),
            format!("content {}", i),
        )
        .unwrap();
        heddle(
            &["capture", "-m", &format!("Commit {}", i)],
            Some(temp.path()),
        )
        .unwrap();
    }

    let log = heddle(&["log", "--oneline", "--output", "text"], Some(temp.path())).unwrap();
    let commits: Vec<&str> = log
        .lines()
        .take(2)
        .map(|l| l.split_whitespace().next().unwrap())
        .collect();

    heddle(&["switch", "HEAD~2"], Some(temp.path())).unwrap();
    for commit in commits.iter().rev() {
        let result = heddle(&["cherry-pick", commit], Some(temp.path()));
        assert!(
            result.is_ok(),
            "cherry-pick {} failed: {:?}",
            commit,
            result.err()
        );
    }

    for i in 1..=3 {
        assert_exists(
            temp.path().join(format!("file{}.txt", i)),
            &format!("file {} should exist", i),
        );
    }
}