diffler 0.14.1

Terminal code review for AI coding agents
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
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222

//! End-to-end config layering through the real binary's `config --dump`.
//!
//! Env vars are set on the child process only: edition 2024 makes
//! `std::env::set_var` unsafe (and the workspace denies unsafe code), and
//! per-child env needs no cross-test serialization.

// helper fns run outside #[test] fns, where clippy's test allowances don't reach
#![allow(clippy::expect_used)]

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

fn write_config(dir: &Path, contents: &str) {
    std::fs::create_dir_all(dir).expect("config dir");
    std::fs::write(dir.join("config.toml"), contents).expect("config file");
}

fn init_repo(dir: &Path) {
    git2::Repository::init(dir).expect("git init");
}

/// Run `diffler <repo> config --dump <extra>` with a controlled environment.
fn dump(repo: &Path, xdg: Option<&Path>, home: Option<&Path>, extra: &[&str]) -> Output {
    let mut cmd = Command::new(env!("CARGO_BIN_EXE_diffler"));
    cmd.arg(repo).arg("config").arg("--dump").args(extra);
    cmd.env_remove("XDG_CONFIG_HOME").env_remove("HOME");
    if let Some(xdg) = xdg {
        cmd.env("XDG_CONFIG_HOME", xdg);
    }
    if let Some(home) = home {
        cmd.env("HOME", home);
    }
    cmd.output().expect("run diffler")
}

fn stdout(output: &Output) -> String {
    assert!(
        output.status.success(),
        "diffler failed: {}",
        String::from_utf8_lossy(&output.stderr)
    );
    String::from_utf8_lossy(&output.stdout).into_owned()
}

#[test]
fn defaults_dump_when_no_config_exists() {
    let repo = tempfile::tempdir().expect("repo dir");
    let xdg = tempfile::tempdir().expect("xdg dir");
    init_repo(repo.path());

    let out = stdout(&dump(repo.path(), Some(xdg.path()), None, &[]));
    assert!(out.contains("theme = \"github-dark\""));
    assert!(out.contains("context_lines = 3"));
    assert!(out.contains("recent_commits = 10"));
    assert!(out.contains("status_file_layout = \"list\""));
    assert!(out.contains("diff_file_layout = \"tree\""));
    assert!(out.contains("enabled = true"));
    assert!(out.contains("port = 8417"));
    assert!(out.contains("# ui.theme = default"));
    assert!(out.contains("# ui.status_file_layout = default"));
    assert!(out.contains("# ui.diff_file_layout = default"));
    assert!(out.contains("# mcp.port = default"));
    assert!(out.contains("# editor.command = default"));
}

#[test]
fn file_layout_override_dumps_with_its_origin() {
    let repo = tempfile::tempdir().expect("repo dir");
    let xdg = tempfile::tempdir().expect("xdg dir");
    init_repo(repo.path());
    write_config(
        &xdg.path().join("diffler"),
        "[ui]\nstatus_file_layout = \"tree\"\ndiff_file_layout = \"review\"\n",
    );

    let out = stdout(&dump(repo.path(), Some(xdg.path()), None, &[]));
    assert!(out.contains("status_file_layout = \"tree\""));
    assert!(out.contains("diff_file_layout = \"review\""));
    assert!(out.contains("# ui.status_file_layout = global:"));
    assert!(out.contains("# ui.diff_file_layout = global:"));
}

#[test]
fn precedence_global_project_cli_via_xdg() {
    let repo = tempfile::tempdir().expect("repo dir");
    let xdg = tempfile::tempdir().expect("xdg dir");
    init_repo(repo.path());

    write_config(
        &xdg.path().join("diffler"),
        "[ui]\ntheme = \"global-theme\"\ncontext_lines = 7\n\n[mcp]\nport = 9000\n\n[keys.status]\nquit = \"q\"\n",
    );
    write_config(
        &repo.path().join(".diffler"),
        "[ui]\ntheme = \"project-theme\"\n\n[keys.status]\nrefresh = \"<c-r>\"\n",
    );

    let out = stdout(&dump(
        repo.path(),
        Some(xdg.path()),
        None,
        &["--port", "9999", "--no-mcp"],
    ));
    // per-field precedence: project beats global on theme, global survives on
    // context_lines and the quit key, CLI beats both on port/enabled
    assert!(out.contains("theme = \"project-theme\""));
    assert!(out.contains("context_lines = 7"));
    assert!(out.contains("port = 9999"));
    assert!(out.contains("enabled = false"));
    assert!(out.contains("quit = \"q\""));
    assert!(out.contains("refresh = \"<c-r>\""));

    assert!(out.contains("# ui.theme = project:"));
    assert!(out.contains("# ui.context_lines = global:"));
    assert!(out.contains("# mcp.port = cli"));
    assert!(out.contains("# mcp.enabled = cli"));
    assert!(out.contains("# keys.status.quit = global:"));
    assert!(out.contains("# keys.status.refresh = project:"));
}

#[test]
fn home_dot_config_is_used_when_xdg_unset() {
    let repo = tempfile::tempdir().expect("repo dir");
    let home = tempfile::tempdir().expect("home dir");
    init_repo(repo.path());

    write_config(
        &home.path().join(".config").join("diffler"),
        "[ui]\ntheme = \"home-theme\"\n",
    );

    let out = stdout(&dump(repo.path(), None, Some(home.path()), &[]));
    assert!(out.contains("theme = \"home-theme\""));
    assert!(out.contains("# ui.theme = global:"));
}

#[test]
fn cli_theme_flag_wins_over_files() {
    let repo = tempfile::tempdir().expect("repo dir");
    let xdg = tempfile::tempdir().expect("xdg dir");
    init_repo(repo.path());
    write_config(
        &xdg.path().join("diffler"),
        "[ui]\ntheme = \"global-theme\"\n",
    );

    let out = stdout(&dump(
        repo.path(),
        Some(xdg.path()),
        None,
        &["--theme", "cli-theme"],
    ));
    assert!(out.contains("theme = \"cli-theme\""));
    assert!(out.contains("# ui.theme = cli"));
}

#[test]
fn unknown_keys_surface_as_warnings() {
    let repo = tempfile::tempdir().expect("repo dir");
    let xdg = tempfile::tempdir().expect("xdg dir");
    init_repo(repo.path());
    write_config(&xdg.path().join("diffler"), "[ui]\nthme = \"oops\"\n");

    let out = stdout(&dump(repo.path(), Some(xdg.path()), None, &[]));
    assert!(out.contains("## warnings"));
    assert!(out.contains("unknown key `ui.thme`"));
}

#[test]
fn bad_toml_fails_and_names_the_file() {
    let repo = tempfile::tempdir().expect("repo dir");
    let xdg = tempfile::tempdir().expect("xdg dir");
    init_repo(repo.path());
    write_config(&xdg.path().join("diffler"), "[ui\ntheme = ");

    let output = dump(repo.path(), Some(xdg.path()), None, &[]);
    assert!(!output.status.success());
    let stderr = String::from_utf8_lossy(&output.stderr);
    let expected = xdg.path().join("diffler").join("config.toml");
    assert!(
        stderr.contains(&expected.display().to_string()),
        "stderr should name the broken file: {stderr}"
    );
}

#[test]
fn outside_a_repo_project_layer_is_skipped() {
    let dir = tempfile::tempdir().expect("plain dir");
    let xdg = tempfile::tempdir().expect("xdg dir");

    let out = stdout(&dump(dir.path(), Some(xdg.path()), None, &[]));
    assert!(out.contains("theme = \"github-dark\""));
}

// A bad chord string must appear under ## warnings in
// --dump output, naming the dotted key path so the user knows what to fix.
#[test]
fn bad_chord_appears_in_dump_warnings() {
    let repo = tempfile::tempdir().expect("repo dir");
    let xdg = tempfile::tempdir().expect("xdg dir");
    init_repo(repo.path());
    write_config(
        &xdg.path().join("diffler"),
        "[keys.status]\nquit = \"q\"\nrefresh = \"<ctlr-r>\"\n",
    );

    let out = stdout(&dump(repo.path(), Some(xdg.path()), None, &[]));
    assert!(
        out.contains("## warnings"),
        "dump should have a warnings section"
    );
    assert!(
        out.contains("keys.status.refresh"),
        "warning should name the key path: {out}"
    );
    assert!(
        out.contains("<ctlr-r>"),
        "warning should quote the bad chord: {out}"
    );
    // good chord is still stored (not warned about)
    assert!(out.contains("quit = \"q\""));
}