git-stk 0.9.3

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

mod common;

use common::TestRepo;

/// Stand in for another git-stk process holding the operation lock.
fn hold_lock(repo: &TestRepo) {
    std::fs::write(repo.path().join(".git/stk-lock"), "99999 merge\n").expect("write lock");
}

#[test]
fn mutating_command_refuses_while_locked() {
    let repo = TestRepo::new();
    hold_lock(&repo);

    repo.stack()
        .args(["new", "feature/x"])
        .assert()
        .failure()
        .stderr(predicates::str::contains(
            "another git stk operation is in progress",
        ))
        // The holder line is surfaced so the message is actionable.
        .stderr(predicates::str::contains("99999 merge"));
}

#[test]
fn linked_worktrees_share_one_lock() {
    let repo = TestRepo::new();

    // A linked worktree of the same repo: it shares the common git dir, and so
    // the same `branch.*` stack metadata the lock guards.
    repo.git(["branch", "wt-branch"]);
    let worktree = repo.path().join("linked-wt");
    repo.git(["worktree", "add", worktree.to_str().unwrap(), "wt-branch"]);

    // The main worktree holds the lock (written under the shared common dir).
    hold_lock(&repo);

    // A mutating command from the linked worktree must see that one lock and
    // refuse - a per-worktree lock would let it clobber the shared metadata.
    repo.stack_in(&worktree)
        .args(["new", "feature/x"])
        .assert()
        .failure()
        .stderr(predicates::str::contains(
            "another git stk operation is in progress",
        ));
}

#[test]
fn read_only_command_ignores_the_lock() {
    let repo = TestRepo::new();
    hold_lock(&repo);

    // Navigation/read-only commands are safe to run alongside anything.
    repo.stack().args(["list"]).assert().success();
}

#[test]
fn mutating_command_releases_the_lock_when_done() {
    let repo = TestRepo::new();

    repo.stack().args(["new", "feature/x"]).assert().success();

    assert!(
        !repo.path().join(".git/stk-lock").exists(),
        "the lock file should be gone once the command finishes"
    );
}