tij 0.11.0

Text-mode interface for Jujutsu - a TUI for jj version control
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

//! Squash and Absorb integration tests.
//!
//! Tests for squash and absorb operations.

#[path = "common/mod.rs"]
mod common;

use common::TestRepo;
use tij::jj::JjExecutor;

#[test]
fn test_squash_into_merges_changes() {
    skip_if_no_jj!();
    let repo = TestRepo::new();

    // Setup: parent with changes, child with more changes
    repo.write_file("file1.txt", "parent content");
    repo.jj(&["describe", "-m", "parent"]);
    repo.jj(&["new", "-m", "child"]);
    repo.write_file("file2.txt", "child content");

    let child_id = repo.current_change_id();
    let parent_id = repo
        .jj(&["log", "-r", "@-", "--no-graph", "-T", "change_id.short(8)"])
        .trim()
        .to_string();

    // Non-interactive squash (jj squash --from child --into parent -u)
    // Use -u to avoid opening editor when both revisions have descriptions
    repo.jj(&["squash", "--from", &child_id, "--into", &parent_id, "-u"]);

    // Verify: parent contains file2.txt
    let diff = repo.jj(&["diff", "-r", &parent_id, "--summary"]);
    assert!(
        diff.contains("file2.txt"),
        "parent should contain file2.txt after squash"
    );
}

#[test]
fn test_squash_default_into_parent() {
    skip_if_no_jj!();
    let repo = TestRepo::new();

    // Setup: parent with a file, child with modifications
    repo.write_file("main.rs", "fn main() {}");
    repo.jj(&["describe", "-m", "Initial"]);
    repo.jj(&["new", "-m", "Add feature"]);
    repo.write_file("main.rs", "fn main() { feature(); }");
    repo.write_file("feature.rs", "fn feature() {}");

    let executor = JjExecutor::with_repo_path(repo.path());

    // Squash current changes into parent
    executor.squash().expect("squash should succeed");

    // Verify: @ is now empty or has been absorbed
    // The parent should have the feature
    let parent_diff = repo.jj(&["diff", "-r", "@-", "--summary"]);
    assert!(
        parent_diff.contains("feature.rs") || parent_diff.contains("main.rs"),
        "Parent should contain the squashed changes"
    );
}

#[test]
fn test_absorb_moves_changes_to_ancestor() {
    skip_if_no_jj!();
    let repo = TestRepo::new();

    // Setup
    repo.write_file("code.rs", "fn main() {}");
    repo.jj(&["describe", "-m", "initial"]);
    repo.jj(&["new", "-m", "wip"]);

    // Modify code.rs (same file)
    repo.write_file("code.rs", "fn main() { println!(\"hello\"); }");

    let executor = JjExecutor::with_repo_path(repo.path());
    let result = executor.absorb();

    // absorb succeeds but results depend on situation
    assert!(result.is_ok(), "absorb should complete without error");
}