git-stk 0.9.2

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
143
144
145
146
147
148
149
150
151
152
153
154

mod common;

use common::{FakeProvider, TestRepo};

#[test]
fn rename_current_branch_retargets_children() {
    let repo = TestRepo::new();
    repo.stack().args(["new", "feature/a"]).assert().success();
    repo.stack().args(["new", "feature/b"]).assert().success();
    repo.git(["switch", "feature/a"]);

    repo.stack()
        .args(["rename", "feature/a2"])
        .assert()
        .success()
        .stdout(predicates::str::contains("renamed feature/a -> feature/a2"))
        .stdout(predicates::str::contains(
            "retargeted feature/b -> feature/a2",
        ));

    assert_eq!(repo.git(["branch", "--show-current"]), "feature/a2");
    // The branch's own metadata moved with the rename; the child follows.
    assert_eq!(
        repo.git(["config", "--get", "branch.feature/a2.stkParent"]),
        "main"
    );
    assert_eq!(
        repo.git(["config", "--get", "branch.feature/b.stkParent"]),
        "feature/a2"
    );
}

#[test]
fn rename_named_branch_with_two_names() {
    let repo = TestRepo::new();
    repo.stack().args(["new", "feature/a"]).assert().success();
    repo.stack().args(["new", "feature/b"]).assert().success();
    repo.git(["switch", "main"]);

    repo.stack()
        .args(["rename", "feature/a", "feature/a2"])
        .assert()
        .success()
        .stdout(predicates::str::contains("renamed feature/a -> feature/a2"));

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

#[test]
fn rename_retargets_every_direct_child() {
    let repo = TestRepo::new();
    repo.stack().args(["new", "feature/a"]).assert().success();
    repo.stack().args(["new", "feature/b"]).assert().success();
    repo.git(["switch", "feature/a"]);
    repo.stack().args(["new", "feature/c"]).assert().success();

    repo.stack()
        .args(["rename", "feature/a", "feature/a2"])
        .assert()
        .success()
        .stdout(predicates::str::contains(
            "retargeted feature/b -> feature/a2",
        ))
        .stdout(predicates::str::contains(
            "retargeted feature/c -> feature/a2",
        ));

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

#[test]
fn rename_warns_when_a_review_heads_the_old_name() {
    let repo = TestRepo::new();
    repo.git(["config", "stk.provider", "github"]);
    repo.stack().args(["new", "feature/a"]).assert().success();
    let fake = FakeProvider::new()
        .on(
            "feature/a",
            r##"[{"number":12,"state":"OPEN","baseRefName":"main","headRefName":"feature/a","url":"https://github.com/owner/repo/pull/12"}]"##,
        )
        .fallback("[]")
        .install(&repo);

    repo.stack_faked(&fake)
        .args(["rename", "feature/a2"])
        .assert()
        .success()
        .stdout(predicates::str::contains(
            "warning: review #12 still heads feature/a; \
             your next submit opens a fresh review for feature/a2 and closes #12",
        ));

    // The supersession is recorded so the next submit can replace and close it.
    assert_eq!(
        repo.git(["config", "--get", "branch.feature/a2.stkRenamedFrom"]),
        "feature/a"
    );
}

#[test]
fn rename_dry_run_previews_without_renaming() {
    let repo = TestRepo::new();
    repo.stack().args(["new", "feature/a"]).assert().success();
    repo.stack().args(["new", "feature/b"]).assert().success();

    repo.stack()
        .args(["rename", "--dry-run", "feature/a", "feature/a2"])
        .assert()
        .success()
        .stdout(predicates::str::contains(
            "would rename feature/a -> feature/a2",
        ))
        .stdout(predicates::str::contains(
            "would retarget feature/b -> feature/a2",
        ));

    assert!(
        repo.git(["branch", "--list", "feature/a"])
            .contains("feature/a")
    );
    assert_eq!(
        repo.git(["config", "--get", "branch.feature/b.stkParent"]),
        "feature/a"
    );
}

#[test]
fn rename_fails_when_target_exists_and_changes_nothing() {
    let repo = TestRepo::new();
    repo.stack().args(["new", "feature/a"]).assert().success();
    repo.stack().args(["new", "feature/b"]).assert().success();

    repo.stack()
        .args(["rename", "feature/a", "main"])
        .assert()
        .failure()
        .stderr(predicates::str::contains("failed to rename feature/a"));

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