git-stk 0.8.6

Git-native stacked branch workflow helper
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
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142

mod common;

use common::TestRepo;
use predicates::prelude::PredicateBooleanExt;

/// A linear stack main <- feature/a <- feature/b with real commits.
fn linear_stack() -> TestRepo {
    let repo = TestRepo::new();
    repo.stack().args(["new", "feature/a"]).assert().success();
    repo.commit_file("a.txt", "a\n", "a work");
    repo.stack().args(["new", "feature/b"]).assert().success();
    repo.commit_file("b.txt", "b\n", "b work");
    repo
}

#[test]
fn new_insert_splices_above_current_and_retargets_children() {
    let repo = linear_stack();
    repo.git(["switch", "feature/a"]);

    repo.stack()
        .args(["new", "feature/mid", "--insert"])
        .assert()
        .success()
        .stdout(predicates::str::contains(
            "inserted feature/mid above feature/a",
        ))
        .stdout(predicates::str::contains(
            "retargeted feature/b -> feature/mid",
        ));

    // main <- feature/a <- feature/mid <- feature/b
    assert_eq!(repo.git(["branch", "--show-current"]), "feature/mid");
    assert_eq!(
        repo.git(["config", "--get", "branch.feature/mid.stkParent"]),
        "feature/a"
    );
    assert_eq!(
        repo.git(["config", "--get", "branch.feature/b.stkParent"]),
        "feature/mid"
    );
    // The inserted branch shares feature/a's tip, so feature/b stays based on
    // the same commit it always was.
    assert_eq!(
        repo.git(["rev-parse", "feature/mid"]),
        repo.git(["rev-parse", "feature/a"])
    );
    assert_eq!(
        repo.git(["config", "--get", "branch.feature/b.stkBase"]),
        repo.git(["rev-parse", "feature/a"])
    );
}

#[test]
fn new_prepend_splices_below_current() {
    let repo = linear_stack();
    repo.git(["switch", "feature/b"]);

    repo.stack()
        .args(["new", "feature/mid", "--prepend"])
        .assert()
        .success()
        .stdout(predicates::str::contains(
            "inserted feature/mid between feature/a and feature/b",
        ))
        .stdout(predicates::str::contains(
            "retargeted feature/b -> feature/mid",
        ));

    // main <- feature/a <- feature/mid <- feature/b
    assert_eq!(repo.git(["branch", "--show-current"]), "feature/mid");
    assert_eq!(
        repo.git(["config", "--get", "branch.feature/mid.stkParent"]),
        "feature/a"
    );
    assert_eq!(
        repo.git(["config", "--get", "branch.feature/b.stkParent"]),
        "feature/mid"
    );
    assert_eq!(
        repo.git(["rev-parse", "feature/mid"]),
        repo.git(["rev-parse", "feature/a"])
    );
}

#[test]
fn new_insert_on_a_leaf_just_extends_the_stack() {
    let repo = linear_stack(); // standing on the leaf, feature/b

    repo.stack()
        .args(["new", "feature/top", "--insert"])
        .assert()
        .success()
        .stdout(predicates::str::contains(
            "inserted feature/top above feature/b",
        ))
        // No children to move.
        .stdout(predicates::str::contains("retargeted").not());

    assert_eq!(repo.git(["branch", "--show-current"]), "feature/top");
    assert_eq!(
        repo.git(["config", "--get", "branch.feature/top.stkParent"]),
        "feature/b"
    );
}

#[test]
fn new_insert_and_prepend_conflict() {
    let repo = linear_stack();

    repo.stack()
        .args(["new", "feature/mid", "--insert", "--prepend"])
        .assert()
        .failure();
}

#[test]
fn new_prepend_without_a_parent_fails() {
    let repo = linear_stack();
    repo.git(["switch", "main"]);

    repo.stack()
        .args(["new", "feature/mid", "--prepend"])
        .assert()
        .failure()
        .stderr(predicates::str::contains(
            "no stack parent to prepend below",
        ));
}

#[test]
fn new_prepend_refuses_a_dirty_worktree() {
    let repo = linear_stack();
    repo.git(["switch", "feature/b"]);
    repo.write("a.txt", "uncommitted\n");

    repo.stack()
        .args(["new", "feature/mid", "--prepend"])
        .assert()
        .failure()
        .stderr(predicates::str::contains("uncommitted changes"));
}