OXYGENHUB
# 87322662f607 oxygen / tests / cli_json.rs
23.3 KiB · Rust · last changed oxy show --stat: the files a change touched, with lines added and removed 18 days ago source blame history raw
1
//! Every `--json` output of the CLI parses as JSON and carries the fields
2
//! the VS Code extension relies on (oxygen-vscode/docs/spec.md section 4).
3
4
use serde_json::Value;
5
use std::path::Path;
6
use std::process::Command;
7
8
fn oxy(dir: &Path, home: &Path, args: &[&str]) -> (i32, Vec<u8>, String) {
9
    let out = Command::new(env!("CARGO_BIN_EXE_oxy"))
10
        .arg("--plain")
11
        .args(args)
12
        .current_dir(dir)
13
        .env("OXY_HOME", home)
14
        .env("NO_COLOR", "1")
15
        .output()
16
        .unwrap();
17
    (
18
        out.status.code().unwrap_or(-1),
19
        out.stdout,
20
        String::from_utf8_lossy(&out.stderr).to_string(),
21
    )
22
}
23
24
fn json(dir: &Path, home: &Path, args: &[&str]) -> Value {
25
    let (code, out, err) = oxy(dir, home, args);
26
    assert!(
27
        code == 0 || code == 2 || code == 1,
28
        "oxy {args:?} exited {code}: {err}"
29
    );
30
    serde_json::from_slice(&out).unwrap_or_else(|e| {
31
        panic!(
32
            "oxy {args:?} is not JSON: {e}\n{}",
33
            String::from_utf8_lossy(&out)
34
        )
35
    })
36
}
37
38
fn write(dir: &Path, rel: &str, content: &str) {
39
    let p = dir.join(rel);
40
    std::fs::create_dir_all(p.parent().unwrap()).unwrap();
41
    std::fs::write(p, content).unwrap();
42
}
43
44
#[test]
45
fn machine_interface_round_trips() {
46
    let tmp = tempfile::tempdir().unwrap();
47
    let home = tmp.path().join("home");
48
    std::fs::create_dir_all(&home).unwrap();
49
    let origin = tmp.path().join("origin");
50
    assert_eq!(
51
        oxy(tmp.path(), &home, &["init", origin.to_str().unwrap()]).0,
52
        0
53
    );
54
    let repo = tmp.path().join("repo");
55
    assert_eq!(
56
        oxy(
57
            tmp.path(),
58
            &home,
59
            &["clone", origin.to_str().unwrap(), repo.to_str().unwrap()]
60
        )
61
        .0,
62
        0
63
    );
64
    let r = repo.as_path();
65
    assert_eq!(
66
        oxy(
67
            r,
68
            &home,
69
            &[
70
                "identity",
71
                "create",
72
                "--name",
73
                "Ada",
74
                "--email",
75
                "[email protected]"
76
            ]
77
        )
78
        .0,
79
        0
80
    );
81
    assert_eq!(
82
        oxy(r, &home, &["config", "--user", "core.sign", "change"]).0,
83
        0
84
    );
85
86
    let v = json(r, &home, &["version", "--json"]);
87
    assert_eq!(v["protocol"], 1);
88
    let root = json(r, &home, &["root", "--json"]);
89
    assert_eq!(root["bookmark"], "main");
90
    assert!(root["root"].as_str().unwrap().ends_with("repo"));
91
92
    write(r, "a.txt", "1\n2\n3\n");
93
    write(r, "b.txt", "b\n");
94
    let st = json(r, &home, &["status", "--json"]);
95
    assert_eq!(st["paths"].as_array().unwrap().len(), 2);
96
    assert_eq!(oxy(r, &home, &["commit", "-m", "base"]).0, 0);
97
    write(r, "a.txt", "0\n1\n2\n3\n");
98
    write(r, "b.txt", "b\nbb\n");
99
    write(r, "c.txt", "c\n");
100
101
    // diff and hunks agree on the working copy.
102
    let d = json(r, &home, &["diff", "--json"]);
103
    let files = d["files"].as_array().unwrap();
104
    assert_eq!(files.len(), 3, "{d}");
105
    let a = files.iter().find(|f| f["path"] == "a.txt").unwrap();
106
    assert_eq!(a["kind"], "modified");
107
    assert_eq!(a["hunks"][0]["base_line"], 0);
108
    assert_eq!(a["hunks"][0]["added"][0], "0\n");
109
    let c = files.iter().find(|f| f["path"] == "c.txt").unwrap();
110
    assert_eq!(c["kind"], "added");
111
    let hunks = json(r, &home, &["hunks", "--json"]);
112
    let hunks = hunks.as_array().unwrap();
113
    assert!(hunks.len() >= 3, "{hunks:?}");
114
    let b_hunk = hunks.iter().find(|h| h["path"] == "b.txt").unwrap()["index"]
115
        .as_u64()
116
        .unwrap();
117
    // Commit only b's hunk; discard c by path; then discard a's remaining hunk.
118
    assert_eq!(
119
        oxy(
120
            r,
121
            &home,
122
            &["commit", "-m", "b only", "--hunks", &b_hunk.to_string()]
123
        )
124
        .0,
125
        0
126
    );
127
    assert_eq!(oxy(r, &home, &["discard", "c.txt"]).0, 0);
128
    assert!(!r.join("c.txt").exists());
129
    let hunks = json(r, &home, &["hunks", "--json"]);
130
    let a_hunk = hunks
131
        .as_array()
132
        .unwrap()
133
        .iter()
134
        .find(|h| h["path"] == "a.txt")
135
        .unwrap()["index"]
136
        .as_u64()
137
        .unwrap();
138
    assert_eq!(
139
        oxy(r, &home, &["discard", "--hunks", &a_hunk.to_string()]).0,
140
        0
141
    );
142
    assert_eq!(
143
        std::fs::read_to_string(r.join("a.txt")).unwrap(),
144
        "1\n2\n3\n"
145
    );
146
    let st = json(r, &home, &["status", "--json"]);
147
    assert_eq!(st["clean"], true, "{st}");
148
149
    // cat serves file content at states.
150
    let (code, out, _) = oxy(r, &home, &["cat", "b.txt"]);
151
    assert_eq!((code, out.as_slice()), (0, b"b\nbb\n".as_slice()));
152
    let (code, out, _) = oxy(r, &home, &["cat", "b.txt", "-r", "main"]);
153
    assert_eq!((code, out.as_slice()), (0, b"b\nbb\n".as_slice()));
154
155
    // log, show, verify, op log, bookmarks, remotes, sync.
156
    let log = json(r, &home, &["log", "--json"]);
157
    let changes = log["changes"].as_array().unwrap();
158
    assert_eq!(changes.len(), 3, "working copy plus two changes: {log}");
159
    let head = changes.iter().find(|c| c["message"] == "b only").unwrap();
160
    assert_eq!(head["signature"]["status"], "signed");
161
    assert_eq!(head["author"], "Ada");
162
    let hash = head["hash"].as_str().unwrap().to_string();
163
    let by_path = json(r, &home, &["log", "--json", "--path", "b.txt"]);
164
    assert_eq!(by_path["changes"].as_array().unwrap().len(), 2, "{by_path}");
165
    let show = json(r, &home, &["show", "--json", &format!("#{}", &hash[..12])]);
166
    assert_eq!(show["files"][0]["path"], "b.txt");
167
    // oxygen#119: lines added and removed per file, and --stat.
168
    assert!(show["files"][0]["added"].as_u64().unwrap() >= 1, "{show}");
169
    let (code, out, _) = oxy(r, &home, &["show", "--stat", &format!("#{}", &hash[..12])]);
170
    let out = String::from_utf8_lossy(&out);
171
    assert!(
172
        code == 0 && out.contains("b.txt") && out.contains("1 file changed"),
173
        "{out}"
174
    );
175
    assert!(!out.contains("@@"), "the files, not the diff: {out}");
176
    let verify = json(r, &home, &["verify", "--json"]);
177
    assert!(verify
178
        .as_array()
179
        .unwrap()
180
        .iter()
181
        .all(|v| v["status"] == "signed"));
182
    let ops = json(r, &home, &["op", "log", "--json"]);
183
    assert!(ops[0]["current"] == true && ops.as_array().unwrap().len() > 3);
184
    assert_eq!(oxy(r, &home, &["bookmark", "create", "feature"]).0, 0);
185
    let bms = json(r, &home, &["bookmark", "list", "--json"]);
186
    assert_eq!(
187
        bms.as_array()
188
            .unwrap()
189
            .iter()
190
            .map(|b| b["name"].as_str().unwrap())
191
            .collect::<Vec<_>>(),
192
        vec!["feature", "main"]
193
    );
194
    let remotes = json(r, &home, &["remote", "list", "--json"]);
195
    assert_eq!(remotes[0]["name"], "origin");
196
    let push = json(r, &home, &["push", "--json"]);
197
    assert_eq!(push[0]["ok"], true, "{push}");
198
    let fetch = json(r, &home, &["fetch", "--json"]);
199
    assert_eq!(fetch["remote"], "origin");
200
    let pull = json(r, &home, &["pull", "--json"]);
201
    assert_eq!(pull["changed"], false);
202
    assert_eq!(json(r, &home, &["resolve", "--json"])["conflicted"], false);
203
    assert!(json(r, &home, &["submodule", "status", "--json"])
204
        .as_array()
205
        .unwrap()
206
        .is_empty());
207
    assert!(json(r, &home, &["bisect", "status", "--json"]).is_null());
208
    assert!(json(r, &home, &["policy", "show", "--json"]).is_null());
209
    assert_eq!(oxy(r, &home, &["policy", "init"]).0, 0);
210
    let policy = json(r, &home, &["policy", "show", "--json"]);
211
    assert_eq!(policy["roots"][0]["name"], "Ada");
212
    assert_eq!(
213
        oxy(r, &home, &["tag", "create", "v1", "-m", "first tag"]).0,
214
        0
215
    );
216
    let tags = json(r, &home, &["tag", "list", "--json"]);
217
    assert_eq!(
218
        (tags[0]["name"].as_str(), tags[0]["message"].as_str()),
219
        (Some("v1"), Some("first tag"))
220
    );
221
    let ws = json(r, &home, &["workspace", "list", "--json"]);
222
    assert_eq!(
223
        (ws.as_array().unwrap().len(), ws[0]["current"].as_bool()),
224
        (1, Some(true))
225
    );
226
}
227
228
/// `oxy commit -F`, `oxy describe` naming and tags as changes (feedback
229
/// 4 and 6).
230
#[test]
231
fn commit_from_a_file_and_describe_for_builds() {
232
    let tmp = tempfile::tempdir().unwrap();
233
    let home = tmp.path().join("home");
234
    std::fs::create_dir_all(&home).unwrap();
235
    let dir = tmp.path().join("r");
236
    std::fs::create_dir_all(&dir).unwrap();
237
    assert_eq!(oxy(&dir, &home, &["init"]).0, 0);
238
    write(&dir, "a.txt", "a\n");
239
    write(
240
        tmp.path(),
241
        "msg.txt",
242
        "Subject from a file\n\nA body\nof two lines.\n",
243
    );
244
    let msg = tmp.path().join("msg.txt");
245
    let (code, _, err) = oxy(&dir, &home, &["commit", "-F", msg.to_str().unwrap()]);
246
    assert_eq!(code, 0, "{err}");
247
    let log = json(&dir, &home, &["log", "--json", "-n", "2"]);
248
    assert_eq!(
249
        log["changes"][1]["message"],
250
        "Subject from a file\n\nA body\nof two lines."
251
    );
252
    assert_ne!(oxy(&dir, &home, &["commit"]).0, 0, "a message is required");
253
254
    // Untagged: bookmark and change; a tag names it; later work counts.
255
    let d = json(&dir, &home, &["describe", "--json"]);
256
    assert_eq!(
257
        (d["tag"].clone(), d["dirty"].clone()),
258
        (Value::Null, Value::Bool(false))
259
    );
260
    let change = d["change"].as_str().unwrap().to_string();
261
    assert_eq!(d["describe"], format!("main-{}", &change[..8]));
262
    assert_eq!(
263
        oxy(&dir, &home, &["tag", "create", "v0.1.0", "-m", "first"]).0,
264
        0
265
    );
266
    let (_, out, _) = oxy(&dir, &home, &["describe"]);
267
    assert_eq!(String::from_utf8_lossy(&out).trim(), "v0.1.0");
268
    let (code, out, err) = oxy(&dir, &home, &["show", "v0.1.0"]);
269
    assert_eq!(code, 0, "a tag names its change: {err}");
270
    assert!(String::from_utf8_lossy(&out).contains("Subject from a file"));
271
    write(&dir, "b.txt", "b\n");
272
    let d = json(&dir, &home, &["describe", "--json"]);
273
    assert_eq!(d["describe"], "v0.1.0-dirty");
274
    assert_eq!(oxy(&dir, &home, &["commit", "-m", "b"]).0, 0);
275
    write(&dir, "c.txt", "c\n");
276
    assert_eq!(oxy(&dir, &home, &["commit", "-m", "c"]).0, 0);
277
    let d = json(&dir, &home, &["describe", "--json"]);
278
    let change = d["change"].as_str().unwrap();
279
    assert_eq!(d["distance"], 2);
280
    assert_eq!(d["describe"], format!("v0.1.0-2-{}", &change[..8]));
281
}
282
283
/// `oxy log -L START,END:PATH`: the history of a range of lines.
284
#[test]
285
fn the_history_of_a_function() {
286
    let tmp = tempfile::tempdir().unwrap();
287
    let home = tmp.path().join("home");
288
    std::fs::create_dir_all(&home).unwrap();
289
    let dir = tmp.path().join("r");
290
    std::fs::create_dir_all(&dir).unwrap();
291
    assert_eq!(oxy(&dir, &home, &["init"]).0, 0);
292
    write(&dir, "f.rs", "use x;\nfn a() {\n  one();\n}\n");
293
    assert_eq!(oxy(&dir, &home, &["commit", "-m", "add f"]).0, 0);
294
    write(&dir, "f.rs", "use y;\nfn a() {\n  one();\n}\n");
295
    assert_eq!(oxy(&dir, &home, &["commit", "-m", "import"]).0, 0);
296
    write(&dir, "f.rs", "use y;\nfn a() {\n  two();\n}\n");
297
    assert_eq!(oxy(&dir, &home, &["commit", "-m", "body"]).0, 0);
298
    let v = json(&dir, &home, &["log", "--json", "-L", "2,4:f.rs"]);
299
    let messages: Vec<&str> = v["changes"]
300
        .as_array()
301
        .unwrap()
302
        .iter()
303
        .map(|c| c["message"].as_str().unwrap())
304
        .collect();
305
    assert_eq!(messages, ["body", "add f"], "not the import");
306
    let (code, _, err) = oxy(&dir, &home, &["log", "-L", "2:f.rs"]);
307
    assert_ne!(code, 0);
308
    assert!(err.contains("START,END:PATH"), "{err}");
309
}
310
311
#[test]
312
fn receipts_verify_import_list_show_and_export() {
313
    use oxy_core::hash::{ObjectRef, ObjectType};
314
    use oxy_core::identity::SecretKey;
315
    use oxy_core::objects::StateObject;
316
    use oxy_core::receipt::{Receipt, SignedReceipt};
317
    let tmp = tempfile::tempdir().unwrap();
318
    let home = tmp.path().join("home");
319
    std::fs::create_dir_all(&home).unwrap();
320
    let r = tmp.path().join("repo");
321
    assert_eq!(oxy(tmp.path(), &home, &["init", r.to_str().unwrap()]).0, 0);
322
    write(&r, "a.txt", "a\n");
323
    assert_eq!(oxy(&r, &home, &["commit", "-m", "A"]).0, 0);
324
325
    let repo = oxy_core::repo::Repo::open(&r).unwrap();
326
    let heads = repo.bookmark_heads().unwrap();
327
    let state = oxy_core::hash::hash_object(ObjectType::State, &StateObject::new(heads).encode());
328
    let receipt = Receipt {
329
        job_name: "test".into(),
330
        pipeline_hash: ObjectRef([1; 32]),
331
        scope_tree_hash: ObjectRef([2; 32]),
332
        inputs: vec![],
333
        environment: ObjectRef([3; 32]),
334
        outputs: vec![],
335
        exit_code: 0,
336
        duration_ms: 2500,
337
    };
338
    let sk = SecretKey::generate();
339
    let runner = sk.identity("earth-1", "runner@earth", 1);
340
    let sr = SignedReceipt::sign(receipt, repo.id().unwrap(), state, "demo#7", &runner, &sk);
341
    let file = tmp.path().join("r.receipt");
342
    std::fs::write(&file, sr.encode()).unwrap();
343
    let f = file.to_str().unwrap();
344
345
    let v = json(&r, &home, &["receipt", "verify", f, "--json"]);
346
    assert_eq!(
347
        (v["valid"].as_bool(), v["job"].as_str(), v["run"].as_str()),
348
        (Some(true), Some("test"), Some("demo#7"))
349
    );
350
    assert!(v["attest"].is_null());
351
352
    assert!(json(&r, &home, &["receipt", "list", "--json"])
353
        .as_array()
354
        .unwrap()
355
        .is_empty());
356
    assert_eq!(oxy(&r, &home, &["receipt", "import", f]).0, 0);
357
    let list = json(&r, &home, &["receipt", "list", "--json"]);
358
    let list = list.as_array().unwrap();
359
    assert_eq!(list.len(), 1);
360
    assert_eq!(list[0]["runner_name"], "earth-1");
361
    assert_eq!(list[0]["state"], state.to_hex());
362
    let attest = list[0]["attest"].as_str().unwrap().to_string();
363
    let shown = json(&r, &home, &["receipt", "show", &attest[..10], "--json"]);
364
    assert_eq!(shown["duration_ms"], 2500);
365
366
    let out = tmp.path().join("out.receipt");
367
    assert_eq!(
368
        oxy(
369
            &r,
370
            &home,
371
            &["receipt", "export", &attest[..10], out.to_str().unwrap()]
372
        )
373
        .0,
374
        0
375
    );
376
    assert_eq!(std::fs::read(&out).unwrap(), sr.encode());
377
378
    // A receipt whose result was changed after signing does not verify.
379
    let mut forged = sr.clone();
380
    forged.receipt.exit_code = 3;
381
    std::fs::write(&file, forged.encode()).unwrap();
382
    let (code, out, _) = oxy(&r, &home, &["receipt", "verify", f]);
383
    assert_eq!(code, 1);
384
    assert!(String::from_utf8_lossy(&out).contains("different receipt"));
385
    let (code, _, err) = oxy(&r, &home, &["receipt", "import", f]);
386
    assert_ne!(code, 0);
387
    assert!(err.contains("does not verify"), "{err}");
388
}
389
390
/// Metalgear, 2026-09-29 (oxygen#37): a bookmark created at one of three
391
/// independent heads held only that change and what it depends on, and
392
/// switching to it silently wrote a much older tree.
393
#[test]
394
fn a_bookmark_at_one_head_of_several_is_refused_unless_asked_for() {
395
    let tmp = tempfile::tempdir().unwrap();
396
    let home = tmp.path().join("home");
397
    std::fs::create_dir_all(&home).unwrap();
398
    let r = tmp.path().join("repo");
399
    assert_eq!(oxy(tmp.path(), &home, &["init", r.to_str().unwrap()]).0, 0);
400
    for f in ["a", "b", "c"] {
401
        write(&r, &format!("{f}.txt"), &format!("{f}\n"));
402
        assert_eq!(oxy(&r, &home, &["commit", "-m", f]).0, 0);
403
    }
404
    let bms = json(&r, &home, &["bookmark", "list", "--json"]);
405
    assert_eq!(
406
        bms[0]["heads"].as_array().unwrap().len(),
407
        3,
408
        "independent: {bms}"
409
    );
410
    let log = json(&r, &home, &["log", "--json"]);
411
    let hash = |m: &str| {
412
        let c = log["changes"]
413
            .as_array()
414
            .unwrap()
415
            .iter()
416
            .find(|c| c["message"] == m)
417
            .unwrap();
418
        format!("#{}", &c["hash"].as_str().unwrap()[..12])
419
    };
420
    let b = hash("b");
421
422
    let (code, _, err) = oxy(&r, &home, &["bookmark", "create", "x", &b]);
423
    assert_ne!(code, 0);
424
    assert!(
425
        err.contains("would lack 1 change") && err.contains("--upto") && err.contains("--only"),
426
        "{err}"
427
    );
428
429
    assert_eq!(
430
        oxy(&r, &home, &["bookmark", "create", "upto", &b, "--upto"]).0,
431
        0
432
    );
433
    assert_eq!(
434
        oxy(&r, &home, &["bookmark", "create", "only", &b, "--only"]).0,
435
        0
436
    );
437
    let bms = json(&r, &home, &["bookmark", "list", "--json"]);
438
    let heads = |n: &str| {
439
        bms.as_array()
440
            .unwrap()
441
            .iter()
442
            .find(|x| x["name"] == n)
443
            .unwrap()["heads"]
444
            .as_array()
445
            .unwrap()
446
            .len()
447
    };
448
    assert_eq!(heads("upto"), 2, "a and b: {bms}");
449
    assert_eq!(heads("only"), 1);
450
451
    // Switching to the smaller state says what it leaves out.
452
    let (code, out, err) = oxy(&r, &home, &["bookmark", "switch", "only"]);
453
    assert_eq!(code, 0, "{err}");
454
    let out = String::from_utf8_lossy(&out);
455
    assert!(out.contains("only lacks 2 changes that main has"), "{out}");
456
    assert!(!r.join("a.txt").exists() && r.join("b.txt").exists());
457
458
    // Moving a bookmark asks the same (metalgear, oxygen#42): main at b
459
    // alone would lose a, which it holds and was recorded before b.
460
    let (code, _, err) = oxy(&r, &home, &["bookmark", "set", "main", &b]);
461
    assert_ne!(code, 0);
462
    assert!(
463
        err.contains("would lose 1 change") && err.contains("--upto"),
464
        "{err}"
465
    );
466
    assert_eq!(
467
        oxy(&r, &home, &["bookmark", "set", "main", &b, "--upto"]).0,
468
        0
469
    );
470
    let bms = json(&r, &home, &["bookmark", "list", "--json"]);
471
    let main = bms
472
        .as_array()
473
        .unwrap()
474
        .iter()
475
        .find(|x| x["name"] == "main")
476
        .unwrap();
477
    assert_eq!(main["heads"].as_array().unwrap().len(), 2, "a and b: {bms}");
478
}
479
480
/// oxygen#29: a pull on a feature bookmark said only "Already up to date"
481
/// while main was behind. Since oxygen#48 it updates main too, and says so.
482
#[test]
483
fn pull_names_its_bookmark_and_the_others_it_moved() {
484
    let tmp = tempfile::tempdir().unwrap();
485
    let home = tmp.path().join("home");
486
    std::fs::create_dir_all(&home).unwrap();
487
    let origin = tmp.path().join("origin");
488
    assert_eq!(
489
        oxy(tmp.path(), &home, &["init", origin.to_str().unwrap()]).0,
490
        0
491
    );
492
    let (a, b) = (tmp.path().join("a"), tmp.path().join("b"));
493
    for d in [&a, &b] {
494
        assert_eq!(
495
            oxy(
496
                tmp.path(),
497
                &home,
498
                &["clone", origin.to_str().unwrap(), d.to_str().unwrap()]
499
            )
500
            .0,
501
            0
502
        );
503
    }
504
    write(&a, "one.txt", "one\n");
505
    assert_eq!(oxy(&a, &home, &["commit", "-m", "one"]).0, 0);
506
    assert_eq!(oxy(&a, &home, &["push"]).0, 0);
507
    assert_eq!(oxy(&b, &home, &["pull"]).0, 0);
508
    assert_eq!(oxy(&b, &home, &["bookmark", "create", "feat"]).0, 0);
509
    assert_eq!(oxy(&b, &home, &["bookmark", "switch", "feat"]).0, 0);
510
    assert_eq!(oxy(&b, &home, &["push", "-b", "feat"]).0, 0);
511
    write(&a, "two.txt", "two\n");
512
    assert_eq!(oxy(&a, &home, &["commit", "-m", "two"]).0, 0);
513
    assert_eq!(oxy(&a, &home, &["push"]).0, 0);
514
515
    let (code, out, err) = oxy(&b, &home, &["pull"]);
516
    assert_eq!(code, 0, "{err}");
517
    let out = String::from_utf8_lossy(&out);
518
    assert!(out.contains("feat is up to date with origin"), "{out}");
519
    assert!(out.contains("Also updated main"), "{out}");
520
    assert!(!out.contains("behind"), "{out}");
521
}
522
523
/// oxygen#35: a clean status is answered from the manifest, loading no
524
/// history; any change, a mode change included, falls back to a snapshot.
525
#[test]
526
fn a_clean_status_needs_no_history_and_misses_no_change() {
527
    use std::os::unix::fs::PermissionsExt;
528
    let tmp = tempfile::tempdir().unwrap();
529
    let home = tmp.path().join("home");
530
    std::fs::create_dir_all(&home).unwrap();
531
    let r = tmp.path().join("repo");
532
    assert_eq!(oxy(tmp.path(), &home, &["init", r.to_str().unwrap()]).0, 0);
533
    let old = std::time::SystemTime::now() - std::time::Duration::from_secs(30);
534
    for f in ["a.txt", "b.txt"] {
535
        write(&r, f, &format!("{f}\n"));
536
        std::fs::File::options()
537
            .write(true)
538
            .open(r.join(f))
539
            .unwrap()
540
            .set_modified(old)
541
            .unwrap();
542
    }
543
    assert_eq!(oxy(&r, &home, &["commit", "-m", "two"]).0, 0);
544
    let status = |r: &Path| {
545
        let out = Command::new(env!("CARGO_BIN_EXE_oxy"))
546
            .args(["--plain", "status"])
547
            .current_dir(r)
548
            .env("OXY_HOME", &home)
549
            .env("NO_COLOR", "1")
550
            .env("OXY_TIMINGS", "1")
551
            .output()
552
            .unwrap();
553
        (
554
            String::from_utf8_lossy(&out.stdout).to_string(),
555
            String::from_utf8_lossy(&out.stderr).to_string(),
556
        )
557
    };
558
    let (out, err) = status(&r);
559
    assert!(out.contains("working copy clean"), "{out}");
560
    assert!(!err.contains("snapshot"), "no snapshot was needed: {err}");
561
562
    // A mode change alters neither size nor time.
563
    std::fs::set_permissions(r.join("a.txt"), std::fs::Permissions::from_mode(0o755)).unwrap();
564
    let (out, err) = status(&r);
565
    assert!(out.contains("a.txt"), "{out}");
566
    assert!(err.contains("snapshot"), "{err}");
567
    std::fs::set_permissions(r.join("a.txt"), std::fs::Permissions::from_mode(0o644)).unwrap();
568
569
    // A new file.
570
    write(&r, "c.txt", "c\n");
571
    let (out, _) = status(&r);
572
    assert!(out.contains("c.txt"), "{out}");
573
}
574
575
#[test]
576
fn a_nested_git_repository_is_named_not_silently_skipped() {
577
    let tmp = tempfile::tempdir().unwrap();
578
    let home = tmp.path().join("home");
579
    std::fs::create_dir_all(&home).unwrap();
580
    let r = tmp.path().join("repo");
581
    std::fs::create_dir_all(&r).unwrap();
582
    assert_eq!(oxy(&r, &home, &["init", "."]).0, 0);
583
    write(&r, "a.txt", "a\n");
584
    write(&r, "rust-core/src/lib.rs", "pub fn f() {}\n");
585
    write(&r, "rust-core/.git/HEAD", "ref: refs/heads/main\n");
586
    let st = json(&r, &home, &["status", "--json"]);
587
    assert_eq!(st["untracked_nested"], serde_json::json!(["rust-core"]));
588
    let (code, out, err) = oxy(&r, &home, &["commit", "-m", "first"]);
589
    assert_eq!(code, 0, "{err}");
590
    let out = String::from_utf8_lossy(&out);
591
    assert!(
592
        out.contains("rust-core/") && out.contains("nested Git repository"),
593
        "{out}"
594
    );
595
    // The clean status says so too.
596
    let (_, out, _) = oxy(&r, &home, &["status"]);
597
    let out = String::from_utf8_lossy(&out);
598
    assert!(
599
        out.contains("working copy clean") && out.contains("rust-core/"),
600
        "{out}"
601
    );
602
}
603
604
/// oxygen#50: the log is a graph. Two changes that build on the same one
605
/// take two lanes that join above it; each change shows its ID, author,
606
/// time and hash on one line and its subject on the next.
607
#[test]
608
fn the_log_draws_lanes_that_join() {
609
    let tmp = tempfile::tempdir().unwrap();
610
    let home = tmp.path().join("home");
611
    std::fs::create_dir_all(&home).unwrap();
612
    let repo = tmp.path().join("r");
613
    assert_eq!(oxy(tmp.path(), &home, &["init", repo.to_str().unwrap()]).0, 0);
614
    write(&repo, "a.txt", "a\n");
615
    write(&repo, "b.txt", "b\n");
616
    assert_eq!(oxy(&repo, &home, &["commit", "-m", "both files"]).0, 0);
617
    write(&repo, "a.txt", "a\na2\n");
618
    assert_eq!(oxy(&repo, &home, &["commit", "-m", "edit a"]).0, 0);
619
    write(&repo, "b.txt", "b\nb2\n");
620
    assert_eq!(oxy(&repo, &home, &["commit", "-m", "edit b"]).0, 0);
621
622
    let (code, out, err) = oxy(&repo, &home, &["log"]);
623
    assert_eq!(code, 0, "{err}");
624
    let out = String::from_utf8_lossy(&out);
625
    let lines: Vec<&str> = out.lines().collect();
626
    // The working copy, then "edit b", "edit a" beside it, then their base.
627
    assert!(lines[0].starts_with('@'), "{out}");
628
    assert!(lines.iter().any(|l| l.starts_with("|-'") && l.contains("edit a")), "{out}");
629
    assert!(lines.iter().any(|l| l.starts_with("| *") || l.starts_with("| o")), "{out}");
630
    let base = lines.iter().position(|l| l.contains("both files")).unwrap();
631
    assert!(lines[base - 1].contains('#'), "the header line carries the hash: {out}");
632
}