jj-hooks 0.3.3

Run pre-commit / lefthook / hk hooks against jj bookmark pushes
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

//! Integration tests against real jj + git repos in tempdirs.
//!
//! Requires `jj` and `git` on PATH.

use std::path::{Path, PathBuf};
use std::process::Command;

use jj_hooks::jj::{self, JjCli};
use jj_hooks::worktree::Worktree;
use tempfile::TempDir;

/// Set up a primary colocated jj+git repo at `<tmp>/primary` with one commit.
/// Returns (tmp, primary_path, head_commit_id).
fn setup_primary_repo() -> (TempDir, PathBuf, String) {
    let tmp = TempDir::new().unwrap();
    let primary = tmp.path().join("primary");
    std::fs::create_dir(&primary).unwrap();

    run(&primary, "jj", &["git", "init", "--colocate"]);

    std::fs::write(primary.join("hello.txt"), "hello\n").unwrap();
    run(&primary, "jj", &["commit", "-m", "initial"]);

    // commit_id of @- (the change we just committed)
    let commit_id = run_capture(
        &primary,
        "jj",
        &[
            "log",
            "--no-graph",
            "-r",
            "@-",
            "-T",
            "commit_id",
            "--color",
            "never",
            "--ignore-working-copy",
        ],
    );

    (tmp, primary, commit_id)
}

#[test]
fn primary_git_dir_on_primary_workspace() {
    let (_tmp, primary, _) = setup_primary_repo();
    let resolved = jj::primary_git_dir(&primary).unwrap();
    let expected = primary.join(".git").canonicalize().unwrap();
    assert_eq!(resolved, expected);
}

#[test]
fn primary_git_dir_on_secondary_workspace() {
    let (_tmp, primary, _) = setup_primary_repo();

    let secondary = primary.parent().unwrap().join("secondary");
    run(
        &primary,
        "jj",
        &["workspace", "add", secondary.to_str().unwrap(), "-r", "@-"],
    );

    let from_primary = jj::primary_git_dir(&primary).unwrap();
    let from_secondary = jj::primary_git_dir(&secondary).unwrap();
    assert_eq!(from_primary, from_secondary);
    assert_eq!(from_primary, primary.join(".git").canonicalize().unwrap());
}

#[test]
fn workspace_root_resolves_from_subdirectory() {
    let (_tmp, primary, _) = setup_primary_repo();
    let sub = primary.join("nested/dir");
    std::fs::create_dir_all(&sub).unwrap();

    let jj_cli = JjCli::new(&sub);
    let root = jj_cli.workspace_root().unwrap();
    assert_eq!(root, primary.canonicalize().unwrap());
}

#[test]
fn worktree_creates_then_removes_on_drop() {
    let (_tmp, primary, commit_id) = setup_primary_repo();
    let git_dir = jj::primary_git_dir(&primary).unwrap();

    let path: PathBuf;
    {
        let wt = Worktree::create(&git_dir, &commit_id).unwrap();
        path = wt.path().to_owned();
        assert!(path.exists(), "worktree dir should exist while guard alive");
        assert!(
            path.join("hello.txt").exists(),
            "target commit's file should be checked out"
        );
    }
    assert!(
        !path.exists(),
        "worktree dir should be removed when guard drops"
    );

    // And git should agree it's gone.
    let list = run_capture(&primary, "git", &["worktree", "list", "--porcelain"]);
    assert!(
        !list.contains(path.to_str().unwrap()),
        "git worktree list should not include the removed worktree:\n{list}"
    );
}

#[test]
fn worktree_in_secondary_workspace_uses_primary_git_dir() {
    let (_tmp, primary, commit_id) = setup_primary_repo();

    let secondary = primary.parent().unwrap().join("secondary");
    run(
        &primary,
        "jj",
        &["workspace", "add", secondary.to_str().unwrap(), "-r", "@-"],
    );

    let git_dir = jj::primary_git_dir(&secondary).unwrap();
    let wt = Worktree::create(&git_dir, &commit_id).unwrap();
    assert!(wt.path().join("hello.txt").exists());
}

fn run(cwd: &Path, prog: &str, args: &[&str]) {
    let out = Command::new(prog)
        .args(args)
        .current_dir(cwd)
        .output()
        .unwrap_or_else(|e| panic!("failed to spawn {prog}: {e}"));
    if !out.status.success() {
        panic!(
            "{prog} {args:?} failed in {cwd:?}:\nstdout: {}\nstderr: {}",
            String::from_utf8_lossy(&out.stdout),
            String::from_utf8_lossy(&out.stderr),
        );
    }
}

fn run_capture(cwd: &Path, prog: &str, args: &[&str]) -> String {
    let out = Command::new(prog)
        .args(args)
        .current_dir(cwd)
        .output()
        .unwrap_or_else(|e| panic!("failed to spawn {prog}: {e}"));
    if !out.status.success() {
        panic!(
            "{prog} {args:?} failed in {cwd:?}:\nstdout: {}\nstderr: {}",
            String::from_utf8_lossy(&out.stdout),
            String::from_utf8_lossy(&out.stderr),
        );
    }
    String::from_utf8(out.stdout).unwrap().trim().to_string()
}