OXYGENHUB
# 78b49d4d01f0 oxygen / tests / cli_json.rs
26.5 KiB · Rust · last changed oxy show --stat: the files a change touched, with lines added and removed 17 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
    // Keyless (oxygenhub#241): a hub's certified subject may sign too.
213
    let hub =
214
        oxy_core::identity::SecretKey::generate().identity("oxygenhub.io", "[email protected]", 1);
215
    let hub_file = r.join("hub.identity");
216
    std::fs::write(&hub_file, hub.encode()).unwrap();
217
    let grant = [
218
        "policy",
219
        "grant-subject",
220
        "repo:ada/demo:bookmark:main",
221
        "--issuer",
222
        hub_file.to_str().unwrap(),
223
        "--scope",
224
        "refs",
225
    ];
226
    assert_eq!(oxy(r, &home, &grant).0, 0);
227
    let policy = json(r, &home, &["policy", "show", "--json"]);
228
    let subjects = &policy["rules"][0]["subjects"][0];
229
    assert_eq!(
230
        (
231
            subjects["subject"].as_str(),
232
            subjects["issuer"]["name"].as_str(),
233
            subjects["scope"].as_str()
234
        ),
235
        (
236
            Some("repo:ada/demo:bookmark:main"),
237
            Some("oxygenhub.io"),
238
            Some("refs")
239
        )
240
    );
241
    std::fs::remove_file(&hub_file).unwrap();
242
    assert_eq!(
243
        oxy(r, &home, &["tag", "create", "v1", "-m", "first tag"]).0,
244
        0
245
    );
246
    let tags = json(r, &home, &["tag", "list", "--json"]);
247
    assert_eq!(
248
        (tags[0]["name"].as_str(), tags[0]["message"].as_str()),
249
        (Some("v1"), Some("first tag"))
250
    );
251
    let ws = json(r, &home, &["workspace", "list", "--json"]);
252
    assert_eq!(
253
        (ws.as_array().unwrap().len(), ws[0]["current"].as_bool()),
254
        (1, Some(true))
255
    );
256
}
257
258
/// `oxy commit -F`, `oxy describe` naming and tags as changes (feedback
259
/// 4 and 6).
260
#[test]
261
fn commit_from_a_file_and_describe_for_builds() {
262
    let tmp = tempfile::tempdir().unwrap();
263
    let home = tmp.path().join("home");
264
    std::fs::create_dir_all(&home).unwrap();
265
    let dir = tmp.path().join("r");
266
    std::fs::create_dir_all(&dir).unwrap();
267
    assert_eq!(oxy(&dir, &home, &["init"]).0, 0);
268
    write(&dir, "a.txt", "a\n");
269
    write(
270
        tmp.path(),
271
        "msg.txt",
272
        "Subject from a file\n\nA body\nof two lines.\n",
273
    );
274
    let msg = tmp.path().join("msg.txt");
275
    let (code, _, err) = oxy(&dir, &home, &["commit", "-F", msg.to_str().unwrap()]);
276
    assert_eq!(code, 0, "{err}");
277
    let log = json(&dir, &home, &["log", "--json", "-n", "2"]);
278
    assert_eq!(
279
        log["changes"][1]["message"],
280
        "Subject from a file\n\nA body\nof two lines."
281
    );
282
    assert_ne!(oxy(&dir, &home, &["commit"]).0, 0, "a message is required");
283
284
    // Untagged: bookmark and change; a tag names it; later work counts.
285
    let d = json(&dir, &home, &["describe", "--json"]);
286
    assert_eq!(
287
        (d["tag"].clone(), d["dirty"].clone()),
288
        (Value::Null, Value::Bool(false))
289
    );
290
    let change = d["change"].as_str().unwrap().to_string();
291
    assert_eq!(d["describe"], format!("main-{}", &change[..8]));
292
    assert_eq!(
293
        oxy(&dir, &home, &["tag", "create", "v0.1.0", "-m", "first"]).0,
294
        0
295
    );
296
    let (_, out, _) = oxy(&dir, &home, &["describe"]);
297
    assert_eq!(String::from_utf8_lossy(&out).trim(), "v0.1.0");
298
    let (code, out, err) = oxy(&dir, &home, &["show", "v0.1.0"]);
299
    assert_eq!(code, 0, "a tag names its change: {err}");
300
    assert!(String::from_utf8_lossy(&out).contains("Subject from a file"));
301
    write(&dir, "b.txt", "b\n");
302
    let d = json(&dir, &home, &["describe", "--json"]);
303
    assert_eq!(d["describe"], "v0.1.0-dirty");
304
    assert_eq!(oxy(&dir, &home, &["commit", "-m", "b"]).0, 0);
305
    write(&dir, "c.txt", "c\n");
306
    assert_eq!(oxy(&dir, &home, &["commit", "-m", "c"]).0, 0);
307
    let d = json(&dir, &home, &["describe", "--json"]);
308
    let change = d["change"].as_str().unwrap();
309
    assert_eq!(d["distance"], 2);
310
    assert_eq!(d["describe"], format!("v0.1.0-2-{}", &change[..8]));
311
}
312
313
/// `oxy log -L START,END:PATH`: the history of a range of lines.
314
#[test]
315
fn the_history_of_a_function() {
316
    let tmp = tempfile::tempdir().unwrap();
317
    let home = tmp.path().join("home");
318
    std::fs::create_dir_all(&home).unwrap();
319
    let dir = tmp.path().join("r");
320
    std::fs::create_dir_all(&dir).unwrap();
321
    assert_eq!(oxy(&dir, &home, &["init"]).0, 0);
322
    write(&dir, "f.rs", "use x;\nfn a() {\n  one();\n}\n");
323
    assert_eq!(oxy(&dir, &home, &["commit", "-m", "add f"]).0, 0);
324
    write(&dir, "f.rs", "use y;\nfn a() {\n  one();\n}\n");
325
    assert_eq!(oxy(&dir, &home, &["commit", "-m", "import"]).0, 0);
326
    write(&dir, "f.rs", "use y;\nfn a() {\n  two();\n}\n");
327
    assert_eq!(oxy(&dir, &home, &["commit", "-m", "body"]).0, 0);
328
    let v = json(&dir, &home, &["log", "--json", "-L", "2,4:f.rs"]);
329
    let messages: Vec<&str> = v["changes"]
330
        .as_array()
331
        .unwrap()
332
        .iter()
333
        .map(|c| c["message"].as_str().unwrap())
334
        .collect();
335
    assert_eq!(messages, ["body", "add f"], "not the import");
336
    let (code, _, err) = oxy(&dir, &home, &["log", "-L", "2:f.rs"]);
337
    assert_ne!(code, 0);
338
    assert!(err.contains("START,END:PATH"), "{err}");
339
}
340
341
#[test]
342
fn receipts_verify_import_list_show_and_export() {
343
    use oxy_core::hash::{ObjectRef, ObjectType};
344
    use oxy_core::identity::SecretKey;
345
    use oxy_core::objects::StateObject;
346
    use oxy_core::receipt::{Receipt, SignedReceipt};
347
    let tmp = tempfile::tempdir().unwrap();
348
    let home = tmp.path().join("home");
349
    std::fs::create_dir_all(&home).unwrap();
350
    let r = tmp.path().join("repo");
351
    assert_eq!(oxy(tmp.path(), &home, &["init", r.to_str().unwrap()]).0, 0);
352
    write(&r, "a.txt", "a\n");
353
    assert_eq!(oxy(&r, &home, &["commit", "-m", "A"]).0, 0);
354
355
    let repo = oxy_core::repo::Repo::open(&r).unwrap();
356
    let heads = repo.bookmark_heads().unwrap();
357
    let state = oxy_core::hash::hash_object(ObjectType::State, &StateObject::new(heads).encode());
358
    let receipt = Receipt {
359
        job_name: "test".into(),
360
        pipeline_hash: ObjectRef([1; 32]),
361
        scope_tree_hash: ObjectRef([2; 32]),
362
        inputs: vec![],
363
        environment: ObjectRef([3; 32]),
364
        outputs: vec![],
365
        exit_code: 0,
366
        duration_ms: 2500,
367
    };
368
    let sk = SecretKey::generate();
369
    let runner = sk.identity("earth-1", "runner@earth", 1);
370
    let sr = SignedReceipt::sign(receipt, repo.id().unwrap(), state, "demo#7", &runner, &sk);
371
    let file = tmp.path().join("r.receipt");
372
    std::fs::write(&file, sr.encode()).unwrap();
373
    let f = file.to_str().unwrap();
374
375
    let v = json(&r, &home, &["receipt", "verify", f, "--json"]);
376
    assert_eq!(
377
        (v["valid"].as_bool(), v["job"].as_str(), v["run"].as_str()),
378
        (Some(true), Some("test"), Some("demo#7"))
379
    );
380
    assert!(v["attest"].is_null());
381
382
    assert!(json(&r, &home, &["receipt", "list", "--json"])
383
        .as_array()
384
        .unwrap()
385
        .is_empty());
386
    assert_eq!(oxy(&r, &home, &["receipt", "import", f]).0, 0);
387
    let list = json(&r, &home, &["receipt", "list", "--json"]);
388
    let list = list.as_array().unwrap();
389
    assert_eq!(list.len(), 1);
390
    assert_eq!(list[0]["runner_name"], "earth-1");
391
    assert_eq!(list[0]["state"], state.to_hex());
392
    let attest = list[0]["attest"].as_str().unwrap().to_string();
393
    let shown = json(&r, &home, &["receipt", "show", &attest[..10], "--json"]);
394
    assert_eq!(shown["duration_ms"], 2500);
395
396
    let out = tmp.path().join("out.receipt");
397
    assert_eq!(
398
        oxy(
399
            &r,
400
            &home,
401
            &["receipt", "export", &attest[..10], out.to_str().unwrap()]
402
        )
403
        .0,
404
        0
405
    );
406
    assert_eq!(std::fs::read(&out).unwrap(), sr.encode());
407
408
    // SLSA provenance is signed with the exporter's key: none yet, so it is
409
    // refused and says what to do.
410
    let prov = tmp.path().join("prov.json");
411
    let p = prov.to_str().unwrap();
412
    let slsa = ["receipt", "export", &attest[..10], p, "--format", "slsa"];
413
    let (code, _, err) = oxy(&r, &home, &slsa);
414
    assert_ne!(code, 0);
415
    assert!(err.contains("oxy identity create"), "{err}");
416
    let ident = [
417
        "identity",
418
        "create",
419
        "--name",
420
        "Ada",
421
        "--email",
422
        "[email protected]",
423
    ];
424
    assert_eq!(oxy(&r, &home, &ident).0, 0);
425
    assert_eq!(oxy(&r, &home, &slsa).0, 0);
426
    let env: serde_json::Value = serde_json::from_slice(&std::fs::read(&prov).unwrap()).unwrap();
427
    assert_eq!(env["payloadType"], oxy_core::dsse::IN_TOTO);
428
    let payload = oxy_core::dsse::base64_decode(env["payload"].as_str().unwrap()).unwrap();
429
    let st: serde_json::Value = serde_json::from_slice(&payload).unwrap();
430
    assert_eq!(st["predicateType"], "https://slsa.dev/provenance/v1");
431
    assert_eq!(st["subject"][0]["digest"]["oxygen-state"], state.to_hex());
432
    let run = &st["predicate"]["runDetails"];
433
    assert_eq!(run["metadata"]["invocationId"], "demo#7");
434
    let kept = oxy_core::dsse::base64_decode(run["byproducts"][0]["content"].as_str().unwrap());
435
    assert_eq!(
436
        kept.unwrap(),
437
        sr.encode(),
438
        "the runner's receipt rides along"
439
    );
440
    // It verifies with the exporter's key and its PEM holds that key.
441
    let repo = oxy_core::repo::Repo::open(&r)
442
        .unwrap()
443
        .with_home(home.clone());
444
    let key = repo.signing_key().unwrap();
445
    assert_eq!(env["signatures"][0]["keyid"], key.to_hex());
446
    let me = repo.identity(&key).unwrap();
447
    let sig = oxy_core::dsse::base64_decode(env["signatures"][0]["sig"].as_str().unwrap()).unwrap();
448
    assert!(oxy_core::dsse::verify(&me, oxy_core::dsse::IN_TOTO, &payload, &sig).is_ok());
449
    assert!(oxy_core::dsse::verify(&runner, oxy_core::dsse::IN_TOTO, &payload, &sig).is_err());
450
    let pem = tmp.path().join("key.pem");
451
    let pem_args = ["identity", "export", "--pem", pem.to_str().unwrap()];
452
    assert_eq!(oxy(&r, &home, &pem_args).0, 0);
453
    assert_eq!(
454
        std::fs::read_to_string(&pem).unwrap(),
455
        oxy_core::dsse::public_pem(&me)
456
    );
457
458
    // A receipt whose result was changed after signing does not verify.
459
    let mut forged = sr.clone();
460
    forged.receipt.exit_code = 3;
461
    std::fs::write(&file, forged.encode()).unwrap();
462
    let (code, out, _) = oxy(&r, &home, &["receipt", "verify", f]);
463
    assert_eq!(code, 1);
464
    assert!(String::from_utf8_lossy(&out).contains("different receipt"));
465
    let (code, _, err) = oxy(&r, &home, &["receipt", "import", f]);
466
    assert_ne!(code, 0);
467
    assert!(err.contains("does not verify"), "{err}");
468
}
469
470
/// Metalgear, 2026-09-29 (oxygen#37): a bookmark created at one of three
471
/// independent heads held only that change and what it depends on, and
472
/// switching to it silently wrote a much older tree.
473
#[test]
474
fn a_bookmark_at_one_head_of_several_is_refused_unless_asked_for() {
475
    let tmp = tempfile::tempdir().unwrap();
476
    let home = tmp.path().join("home");
477
    std::fs::create_dir_all(&home).unwrap();
478
    let r = tmp.path().join("repo");
479
    assert_eq!(oxy(tmp.path(), &home, &["init", r.to_str().unwrap()]).0, 0);
480
    for f in ["a", "b", "c"] {
481
        write(&r, &format!("{f}.txt"), &format!("{f}\n"));
482
        assert_eq!(oxy(&r, &home, &["commit", "-m", f]).0, 0);
483
    }
484
    let bms = json(&r, &home, &["bookmark", "list", "--json"]);
485
    assert_eq!(
486
        bms[0]["heads"].as_array().unwrap().len(),
487
        3,
488
        "independent: {bms}"
489
    );
490
    let log = json(&r, &home, &["log", "--json"]);
491
    let hash = |m: &str| {
492
        let c = log["changes"]
493
            .as_array()
494
            .unwrap()
495
            .iter()
496
            .find(|c| c["message"] == m)
497
            .unwrap();
498
        format!("#{}", &c["hash"].as_str().unwrap()[..12])
499
    };
500
    let b = hash("b");
501
502
    let (code, _, err) = oxy(&r, &home, &["bookmark", "create", "x", &b]);
503
    assert_ne!(code, 0);
504
    assert!(
505
        err.contains("would lack 1 change") && err.contains("--upto") && err.contains("--only"),
506
        "{err}"
507
    );
508
509
    assert_eq!(
510
        oxy(&r, &home, &["bookmark", "create", "upto", &b, "--upto"]).0,
511
        0
512
    );
513
    assert_eq!(
514
        oxy(&r, &home, &["bookmark", "create", "only", &b, "--only"]).0,
515
        0
516
    );
517
    let bms = json(&r, &home, &["bookmark", "list", "--json"]);
518
    let heads = |n: &str| {
519
        bms.as_array()
520
            .unwrap()
521
            .iter()
522
            .find(|x| x["name"] == n)
523
            .unwrap()["heads"]
524
            .as_array()
525
            .unwrap()
526
            .len()
527
    };
528
    assert_eq!(heads("upto"), 2, "a and b: {bms}");
529
    assert_eq!(heads("only"), 1);
530
531
    // Switching to the smaller state says what it leaves out.
532
    let (code, out, err) = oxy(&r, &home, &["bookmark", "switch", "only"]);
533
    assert_eq!(code, 0, "{err}");
534
    let out = String::from_utf8_lossy(&out);
535
    assert!(out.contains("only lacks 2 changes that main has"), "{out}");
536
    assert!(!r.join("a.txt").exists() && r.join("b.txt").exists());
537
538
    // Moving a bookmark asks the same (metalgear, oxygen#42): main at b
539
    // alone would lose a, which it holds and was recorded before b.
540
    let (code, _, err) = oxy(&r, &home, &["bookmark", "set", "main", &b]);
541
    assert_ne!(code, 0);
542
    assert!(
543
        err.contains("would lose 1 change") && err.contains("--upto"),
544
        "{err}"
545
    );
546
    assert_eq!(
547
        oxy(&r, &home, &["bookmark", "set", "main", &b, "--upto"]).0,
548
        0
549
    );
550
    let bms = json(&r, &home, &["bookmark", "list", "--json"]);
551
    let main = bms
552
        .as_array()
553
        .unwrap()
554
        .iter()
555
        .find(|x| x["name"] == "main")
556
        .unwrap();
557
    assert_eq!(main["heads"].as_array().unwrap().len(), 2, "a and b: {bms}");
558
}
559
560
/// oxygen#29: a pull on a feature bookmark said only "Already up to date"
561
/// while main was behind. Since oxygen#48 it updates main too, and says so.
562
#[test]
563
fn pull_names_its_bookmark_and_the_others_it_moved() {
564
    let tmp = tempfile::tempdir().unwrap();
565
    let home = tmp.path().join("home");
566
    std::fs::create_dir_all(&home).unwrap();
567
    let origin = tmp.path().join("origin");
568
    assert_eq!(
569
        oxy(tmp.path(), &home, &["init", origin.to_str().unwrap()]).0,
570
        0
571
    );
572
    let (a, b) = (tmp.path().join("a"), tmp.path().join("b"));
573
    for d in [&a, &b] {
574
        assert_eq!(
575
            oxy(
576
                tmp.path(),
577
                &home,
578
                &["clone", origin.to_str().unwrap(), d.to_str().unwrap()]
579
            )
580
            .0,
581
            0
582
        );
583
    }
584
    write(&a, "one.txt", "one\n");
585
    assert_eq!(oxy(&a, &home, &["commit", "-m", "one"]).0, 0);
586
    assert_eq!(oxy(&a, &home, &["push"]).0, 0);
587
    assert_eq!(oxy(&b, &home, &["pull"]).0, 0);
588
    assert_eq!(oxy(&b, &home, &["bookmark", "create", "feat"]).0, 0);
589
    assert_eq!(oxy(&b, &home, &["bookmark", "switch", "feat"]).0, 0);
590
    assert_eq!(oxy(&b, &home, &["push", "-b", "feat"]).0, 0);
591
    write(&a, "two.txt", "two\n");
592
    assert_eq!(oxy(&a, &home, &["commit", "-m", "two"]).0, 0);
593
    assert_eq!(oxy(&a, &home, &["push"]).0, 0);
594
595
    let (code, out, err) = oxy(&b, &home, &["pull"]);
596
    assert_eq!(code, 0, "{err}");
597
    let out = String::from_utf8_lossy(&out);
598
    assert!(out.contains("feat is up to date with origin"), "{out}");
599
    assert!(out.contains("Also updated main"), "{out}");
600
    assert!(!out.contains("behind"), "{out}");
601
}
602
603
/// oxygen#35: a clean status is answered from the manifest, loading no
604
/// history; any change, a mode change included, falls back to a snapshot.
605
#[test]
606
fn a_clean_status_needs_no_history_and_misses_no_change() {
607
    use std::os::unix::fs::PermissionsExt;
608
    let tmp = tempfile::tempdir().unwrap();
609
    let home = tmp.path().join("home");
610
    std::fs::create_dir_all(&home).unwrap();
611
    let r = tmp.path().join("repo");
612
    assert_eq!(oxy(tmp.path(), &home, &["init", r.to_str().unwrap()]).0, 0);
613
    let old = std::time::SystemTime::now() - std::time::Duration::from_secs(30);
614
    for f in ["a.txt", "b.txt"] {
615
        write(&r, f, &format!("{f}\n"));
616
        std::fs::File::options()
617
            .write(true)
618
            .open(r.join(f))
619
            .unwrap()
620
            .set_modified(old)
621
            .unwrap();
622
    }
623
    assert_eq!(oxy(&r, &home, &["commit", "-m", "two"]).0, 0);
624
    let status = |r: &Path| {
625
        let out = Command::new(env!("CARGO_BIN_EXE_oxy"))
626
            .args(["--plain", "status"])
627
            .current_dir(r)
628
            .env("OXY_HOME", &home)
629
            .env("NO_COLOR", "1")
630
            .env("OXY_TIMINGS", "1")
631
            .output()
632
            .unwrap();
633
        (
634
            String::from_utf8_lossy(&out.stdout).to_string(),
635
            String::from_utf8_lossy(&out.stderr).to_string(),
636
        )
637
    };
638
    let (out, err) = status(&r);
639
    assert!(out.contains("working copy clean"), "{out}");
640
    assert!(!err.contains("snapshot"), "no snapshot was needed: {err}");
641
642
    // A mode change alters neither size nor time.
643
    std::fs::set_permissions(r.join("a.txt"), std::fs::Permissions::from_mode(0o755)).unwrap();
644
    let (out, err) = status(&r);
645
    assert!(out.contains("a.txt"), "{out}");
646
    assert!(err.contains("snapshot"), "{err}");
647
    std::fs::set_permissions(r.join("a.txt"), std::fs::Permissions::from_mode(0o644)).unwrap();
648
649
    // A new file.
650
    write(&r, "c.txt", "c\n");
651
    let (out, _) = status(&r);
652
    assert!(out.contains("c.txt"), "{out}");
653
}
654
655
#[test]
656
fn a_nested_git_repository_is_named_not_silently_skipped() {
657
    let tmp = tempfile::tempdir().unwrap();
658
    let home = tmp.path().join("home");
659
    std::fs::create_dir_all(&home).unwrap();
660
    let r = tmp.path().join("repo");
661
    std::fs::create_dir_all(&r).unwrap();
662
    assert_eq!(oxy(&r, &home, &["init", "."]).0, 0);
663
    write(&r, "a.txt", "a\n");
664
    write(&r, "rust-core/src/lib.rs", "pub fn f() {}\n");
665
    write(&r, "rust-core/.git/HEAD", "ref: refs/heads/main\n");
666
    let st = json(&r, &home, &["status", "--json"]);
667
    assert_eq!(st["untracked_nested"], serde_json::json!(["rust-core"]));
668
    let (code, out, err) = oxy(&r, &home, &["commit", "-m", "first"]);
669
    assert_eq!(code, 0, "{err}");
670
    let out = String::from_utf8_lossy(&out);
671
    assert!(
672
        out.contains("rust-core/") && out.contains("nested Git repository"),
673
        "{out}"
674
    );
675
    // The clean status says so too.
676
    let (_, out, _) = oxy(&r, &home, &["status"]);
677
    let out = String::from_utf8_lossy(&out);
678
    assert!(
679
        out.contains("working copy clean") && out.contains("rust-core/"),
680
        "{out}"
681
    );
682
}
683
684
/// oxygen#50: the log is a graph. Two changes that build on the same one
685
/// take two lanes that join above it; each change shows its ID, author,
686
/// time and hash on one line and its subject on the next.
687
#[test]
688
fn the_log_draws_lanes_that_join() {
689
    let tmp = tempfile::tempdir().unwrap();
690
    let home = tmp.path().join("home");
691
    std::fs::create_dir_all(&home).unwrap();
692
    let repo = tmp.path().join("r");
693
    assert_eq!(oxy(tmp.path(), &home, &["init", repo.to_str().unwrap()]).0, 0);
694
    write(&repo, "a.txt", "a\n");
695
    write(&repo, "b.txt", "b\n");
696
    assert_eq!(oxy(&repo, &home, &["commit", "-m", "both files"]).0, 0);
697
    write(&repo, "a.txt", "a\na2\n");
698
    assert_eq!(oxy(&repo, &home, &["commit", "-m", "edit a"]).0, 0);
699
    write(&repo, "b.txt", "b\nb2\n");
700
    assert_eq!(oxy(&repo, &home, &["commit", "-m", "edit b"]).0, 0);
701
702
    let (code, out, err) = oxy(&repo, &home, &["log"]);
703
    assert_eq!(code, 0, "{err}");
704
    let out = String::from_utf8_lossy(&out);
705
    let lines: Vec<&str> = out.lines().collect();
706
    // The working copy, then "edit b", "edit a" beside it, then their base.
707
    assert!(lines[0].starts_with('@'), "{out}");
708
    assert!(lines.iter().any(|l| l.starts_with("|-'") && l.contains("edit a")), "{out}");
709
    assert!(lines.iter().any(|l| l.starts_with("| *") || l.starts_with("| o")), "{out}");
710
    let base = lines.iter().position(|l| l.contains("both files")).unwrap();
711
    assert!(lines[base - 1].contains('#'), "the header line carries the hash: {out}");
712
}