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