jjpr 0.22.0

Manage stacked pull requests in Jujutsu repositories
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

mod common;

use jjpr::graph::change_graph;
use jjpr::jj::Jj;
use jjpr::submit::analyze;

#[test]
fn test_real_jj_bookmark_parsing() {
    if !common::jj_available() {
        return;
    }

    let repo = common::JjTestRepo::new();
    repo.commit_and_bookmark("auth.rs", "// auth\n", "Add authentication", "auth");

    let jj = repo.runner();
    let bookmarks = jj.get_my_bookmarks().unwrap();

    assert_eq!(bookmarks.len(), 1);
    assert_eq!(bookmarks[0].name, "auth");
    assert!(!bookmarks[0].commit_id.is_empty());
    assert!(!bookmarks[0].change_id.is_empty());
    assert!(!bookmarks[0].has_remote);
    assert!(!bookmarks[0].is_synced);
}

#[test]
fn test_real_jj_log_parsing() {
    if !common::jj_available() {
        return;
    }

    let repo = common::JjTestRepo::new();
    repo.commit_and_bookmark(
        "auth.rs",
        "// auth\n",
        "Add authentication\n\nDetailed auth description",
        "auth",
    );

    let jj = repo.runner();
    let bookmarks = jj.get_my_bookmarks().unwrap();
    let entries = jj.get_changes_to_commit(&bookmarks[0].commit_id).unwrap();

    assert!(!entries.is_empty());
    let entry = &entries[0];
    assert_eq!(entry.commit_id, bookmarks[0].commit_id);
    assert_eq!(entry.change_id, bookmarks[0].change_id);
    assert_eq!(entry.author_name, "Test User");
    assert_eq!(entry.author_email, "test@jjpr.dev");
    assert!(entry.description.starts_with("Add authentication"));
    assert_eq!(entry.description_first_line, "Add authentication");
    assert_eq!(entry.parents.len(), 1, "should have one parent (the initial commit)");
}

#[test]
fn test_real_jj_graph_linear_stack() {
    if !common::jj_available() {
        return;
    }

    let repo = common::JjTestRepo::new();
    repo.commit_and_bookmark("auth.rs", "// auth\n", "Add authentication", "auth");
    repo.commit_and_bookmark("profile.rs", "// profile\n", "Add user profile", "profile");

    let jj = repo.runner();
    let graph = change_graph::build_change_graph(&jj).unwrap();

    assert_eq!(graph.bookmarks.len(), 2);
    assert!(graph.bookmarks.contains_key("auth"));
    assert!(graph.bookmarks.contains_key("profile"));
    assert_eq!(graph.stacks.len(), 1, "should form a single stack");
    let stack = &graph.stacks[0];
    assert_eq!(stack.segments.len(), 2);
    assert_eq!(stack.segments[0].bookmarks[0].name, "auth");
    assert_eq!(stack.segments[1].bookmarks[0].name, "profile");
}

#[test]
fn test_real_jj_default_branch() {
    if !common::jj_available() {
        return;
    }

    let repo = common::JjTestRepo::new();
    let jj = repo.runner();
    let default = jj.get_default_branch().unwrap();
    assert_eq!(default, "main");
}

#[test]
fn test_infer_bookmark_from_working_copy() {
    if !common::jj_available() {
        return;
    }

    let repo = common::JjTestRepo::new();
    repo.commit_and_bookmark("auth.rs", "// auth\n", "Add authentication", "auth");
    repo.commit_and_bookmark("profile.rs", "// profile\n", "Add profile", "profile");

    let jj = repo.runner();
    let graph = change_graph::build_change_graph(&jj).unwrap();

    // Working copy is at @, which is the child of the "profile" commit.
    // The stack contains auth -> profile, so inference should return "profile".
    let inferred = analyze::infer_target_bookmark(&graph, &jj).unwrap();
    assert_eq!(inferred.as_deref(), Some("profile"));
}

#[test]
fn test_push_after_squash() {
    if !common::jj_available() {
        return;
    }

    let repo = common::JjTestRepo::new();
    repo.commit_and_bookmark("feature.rs", "// v1\n", "Add feature", "feature");

    let jj = repo.runner();

    // First push
    jj.push_bookmark("feature", "origin").unwrap();

    // Amend via squash: write new content in working copy, then squash into feature
    repo.write_file("feature.rs", "// v2 amended\n");
    repo.run_jj(&["squash", "--into", "feature"]);

    // Second push should succeed (jj force-pushes diverged bookmarks by design)
    jj.push_bookmark("feature", "origin").unwrap();
}