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