gitu 0.41.0

A git client inspired by Magit
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

use temp_env::with_var;

use super::*;

fn setup_branch(ctx: TestContext) -> TestContext {
    run(&ctx.dir, &["git", "checkout", "-b", "other-branch"]);
    commit(&ctx.dir, "new-file", "hello");
    run(&ctx.dir, &["git", "checkout", "main"]);
    ctx
}

fn setup_branches(ctx: TestContext) -> TestContext {
    // Create multiple branches for merging
    run(&ctx.dir, &["git", "checkout", "-b", "feature-a"]);
    commit(&ctx.dir, "feature-a commit", "");
    run(&ctx.dir, &["git", "checkout", "main"]);

    run(&ctx.dir, &["git", "checkout", "-b", "feature-b"]);
    commit(&ctx.dir, "feature-b commit", "");
    run(&ctx.dir, &["git", "checkout", "main"]);

    run(&ctx.dir, &["git", "checkout", "-b", "bugfix-123"]);
    commit(&ctx.dir, "bugfix commit", "");
    run(&ctx.dir, &["git", "checkout", "main"]);

    // Create some tags
    run(&ctx.dir, &["git", "tag", "v1.0.0", "feature-a"]);
    run(&ctx.dir, &["git", "tag", "v2.0.0", "feature-b"]);

    ctx
}

fn setup_branch_tag_same_name(ctx: TestContext) -> TestContext {
    // Create a branch named v1.0.0
    run(&ctx.dir, &["git", "checkout", "-b", "v1.0.0"]);
    commit(&ctx.dir, "branch commit", "");
    run(&ctx.dir, &["git", "checkout", "main"]);

    // Create a different branch with different content
    run(&ctx.dir, &["git", "checkout", "-b", "other"]);
    commit(&ctx.dir, "other commit", "");

    // Create a tag also named v1.0.0 pointing to this different commit
    run(&ctx.dir, &["git", "tag", "v1.0.0"]);
    run(&ctx.dir, &["git", "checkout", "main"]);

    ctx
}

#[test]
fn merge_menu() {
    snapshot!(setup_branch(setup_clone!()), "m");
}

#[test]
fn merge_picker() {
    snapshot!(setup_branches(setup_clone!()), "mm");
}

#[test]
fn merge_picker_custom_input() {
    snapshot!(setup_branches(setup_clone!()), "mmHEAD~2");
}

#[test]
fn merge_picker_cancel() {
    snapshot!(setup_branches(setup_clone!()), "mm<esc>");
}

#[test]
fn merge_select_from_list() {
    // Select feature-a branch from the list and merge it
    with_var("GIT_MERGE_AUTOEDIT", Some("no"), || {
        snapshot!(setup_branches(setup_clone!()), "mmfeature-a<enter>");
    });
}

#[test]
fn merge_picker_duplicate_names_select_branch() {
    // Test merging the branch when there's a duplicate name
    with_var("GIT_MERGE_AUTOEDIT", Some("no"), || {
        snapshot!(
            setup_branch_tag_same_name(setup_clone!()),
            "mmv1.0.0<enter>"
        );
    });
}

#[test]
fn merge_picker_duplicate_names_select_tag() {
    // Test merging the tag when there's a duplicate name
    with_var("GIT_MERGE_AUTOEDIT", Some("no"), || {
        snapshot!(setup_branch_tag_same_name(setup_clone!()), "mmtag:<enter>");
    });
}

#[test]
fn merge_use_custom_input() {
    // Use custom input with full commit hash
    with_var("GIT_MERGE_AUTOEDIT", Some("no"), || {
        snapshot!(
            setup_branches(setup_clone!()),
            "mmb66a0bf82020d6a386e94d0fceedec1f817d20c7<enter>"
        );
    });
}

#[test]
fn merge_ff_only() {
    snapshot!(setup_branch(setup_clone!()), "m-fmother-branch<enter>");
}

#[test]
fn merge_no_ff() {
    with_var("GIT_MERGE_AUTOEDIT", Some("no"), || {
        snapshot!(setup_branch(setup_clone!()), "m-nmother-branch<enter>");
    });
}