stax 0.69.2

Fast stacked Git branches and PRs
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

mod common;

use common::{OutputAssertions, TestRepo};
use serde_json::Value;

fn create_missing_parent_stack(repo: &TestRepo) -> (String, String) {
    repo.run_stax(&["bc", "missing-parent"]).assert_success();
    let parent = repo.current_branch();

    repo.run_stax(&["bc", "missing-child"]).assert_success();
    let child = repo.current_branch();

    repo.run_stax(&["t"]).assert_success();
    let delete_parent = repo.git(&["branch", "-D", &parent]);
    assert!(
        delete_parent.status.success(),
        "Failed to delete parent branch: {}",
        TestRepo::stderr(&delete_parent)
    );

    (parent, child)
}

#[test]
fn status_json_reports_missing_parent_branch_once() {
    let repo = TestRepo::new();
    let (parent, child) = create_missing_parent_stack(&repo);

    let output = repo.run_stax(&["status", "--json"]);
    output.assert_success();

    let status: Value =
        serde_json::from_str(&TestRepo::stdout(&output)).expect("status JSON should parse");
    let branches = status["branches"]
        .as_array()
        .expect("status JSON should include branches");
    let child_entries: Vec<_> = branches
        .iter()
        .filter(|entry| entry["name"].as_str() == Some(child.as_str()))
        .collect();

    assert_eq!(
        child_entries.len(),
        1,
        "missing-parent child should appear once in status JSON: {}",
        TestRepo::stdout(&output)
    );
    assert_eq!(child_entries[0]["missing_parent"], parent);
}

#[test]
fn status_labels_missing_parent_instead_of_needs_restack() {
    let repo = TestRepo::new();
    let (parent, child) = create_missing_parent_stack(&repo);

    let output = repo.run_stax(&["status"]);
    output.assert_success();

    let stdout = TestRepo::stdout(&output);
    let child_lines: Vec<_> = stdout
        .lines()
        .filter(|line| line.contains(&child))
        .collect();

    assert_eq!(
        child_lines.len(),
        1,
        "missing-parent child should appear once in status output: {stdout}"
    );
    assert!(
        child_lines[0].contains("missing parent") && child_lines[0].contains(&parent),
        "expected missing-parent label for child branch, got: {}",
        child_lines[0]
    );
    assert!(
        !child_lines[0].contains("needs restack"),
        "missing-parent branch should not be labeled as ordinary restack work: {}",
        child_lines[0]
    );
    assert!(
        stdout.contains("stax fix --yes"),
        "status should point users at metadata repair, got: {stdout}"
    );
    assert!(
        !stdout.contains("stax rs --restack"),
        "missing-parent-only status should not suggest restack, got: {stdout}"
    );
}