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