maestro_git 0.2.3

API using libgit2 for stylish version control workflows
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

use std::{
    fs::{read_to_string, write},
    process::Command,
};

use crate::{
    pull::pull_ff,
    testing::{assert_cmd, create_test_repo},
    PullResult, RemoteHost,
};

#[test]
fn pull_ff_detached_head() {
    let test_repo = create_test_repo();
    assert_cmd(
        Command::new("git")
            .arg("checkout")
            .arg("HEAD~1")
            .current_dir(test_repo.path()),
    );
    assert_cmd(
        Command::new("git")
            .arg("checkout")
            .arg("HEAD~1")
            .current_dir(test_repo.path()),
    );

    let result = pull_ff(test_repo.path());
    assert!(result.is_ok());
    assert_eq!(result.unwrap(), PullResult::DetachedHead);
}

#[test]
fn pull_ff_pulled() {
    let test_repo = create_test_repo();
    assert_cmd(
        Command::new("git")
            .arg("reset")
            .arg("--hard")
            .arg("HEAD~2")
            .current_dir(test_repo.path()),
    );

    let result = pull_ff(test_repo.path());
    assert!(result.is_ok());
    assert_eq!(
        result.unwrap(),
        PullResult::FastForward {
            commits: 2,
            from: "e303cea".to_string(),
            to: "fe98a80".to_string(),
            remote: RemoteHost::GitHub {
                owner: "eighty4".to_string(),
                name: "pear.ng".to_string()
            }
        }
    );
}

#[test]
fn pull_ff_unpullable() {
    let test_repo = create_test_repo();
    assert_cmd(
        Command::new("git")
            .arg("reset")
            .arg("--hard")
            .arg("HEAD~2")
            .current_dir(test_repo.path()),
    );
    let conflict_file = "desktop/bin/pear_cli/pear_cli.cc";
    let contents = read_to_string(test_repo.path().join(conflict_file)).unwrap();
    write(
        test_repo.path().join(conflict_file),
        format!("#include \"net_udp/udp.h\"\n{contents}"),
    )
    .unwrap();
    assert_cmd(
        Command::new("git")
            .arg("add")
            .arg(conflict_file)
            .current_dir(test_repo.path()),
    );
    assert_cmd(
        Command::new("git")
            .arg("commit")
            .arg("-m")
            .arg("conflict")
            .current_dir(test_repo.path()),
    );

    let result = pull_ff(test_repo.path());
    assert!(result.is_ok());
    assert_eq!(result.unwrap(), PullResult::UnpullableMerge);
}

#[test]
fn pull_ff_up_to_date() {
    let test_repo = create_test_repo();
    let result = pull_ff(test_repo.path());
    assert!(result.is_ok());
    assert_eq!(result.unwrap(), PullResult::UpToDate);
}