OXYGENHUB
◆ merge-remote-bookmark oxygen / src / cli / workspace.rs
95.7 KiB · Rust · last changed Readers never wait: one head per handle, retry on a miss, retire before deleting 17 days ago source blame history raw
fce44ae9 Andy McCall ↶ 1 
//! Commands that act on the local repository and working copy.
2
75167672 Andy McCall 3 
use super::format::{
5cde7882 Andy McCall ↶ 4 
    author_name, deps_line, deps_of, plural, short_id, signature_line, signature_mark_of,
5 
    subject_of, via, when,
75167672 Andy McCall 6 
};
c6aa5bd9 Andy McCall ↶ 7 
use super::json;
fce44ae9 Andy McCall ↶ 8 
use super::open;
135212de Andy McCall ↶ 9 
use super::ui;
fce44ae9 Andy McCall ↶ 10 
use anyhow::Result;
94084087 Andy McCall ↶ 11 
use oxy_core::objects::ChangeKind;
75167672 Andy McCall 12 
use oxy_core::repo::SignatureStatus;
fce44ae9 Andy McCall ↶ 13 
use oxy_core::repo::{render_change, ChangeStatus, Repo};
fddf64ba Andy McCall ↶ 14 
use std::io::Write;
fce44ae9 Andy McCall ↶ 15 
use std::path::PathBuf;
16
d069701a Andy McCall ↶ 17 
pub fn init(path: Option<PathBuf>, bare: bool, store: Option<&str>) -> Result<i32> {
fce44ae9 Andy McCall ↶ 18 
    let path = path.unwrap_or(std::env::current_dir()?);
d069701a Andy McCall ↶ 19 
    let repo = Repo::init_new(&path, bare, store)?;
75167672 Andy McCall 20 
    println!(
21 
        "{} {}oxy repository in {}",
22 
        ui::done("Initialized"),
23 
        if bare { "bare " } else { "" },
24 
        ui::path(repo.root().display())
25 
    );
26 
    println!(
27 
        "{}",
28 
        ui::kv("bookmark", ui::bookmark(&repo.config.bookmark))
29 
    );
d069701a Andy McCall ↶ 30 
    if let Some(url) = &repo.config.storage_url {
31 
        println!(
32 
            "{}",
33 
            ui::kv(
34 
                "store",
35 
                format!(
36 
                    "{url} (cache in {}, up to {} MiB)",
37 
                    ui::path(repo.root().join(".oxy/cache").display()),
38 
                    repo.config.storage_cache >> 20
39 
                )
40 
            )
41 
        );
42 
    }
75167672 Andy McCall 43 
    println!(
44 
        "{}",
45 
        ui::kv(
46 
            "author",
47 
            format!(
48 
                "{} <{}>",
49 
                ui::author(&repo.config.author_name),
50 
                repo.config.author_email
51 
            )
52 
        )
53 
    );
fce44ae9 Andy McCall ↶ 54 
    Ok(0)
55 
}
56
57 
fn status_tag(s: ChangeStatus) -> &'static str {
58 
    match s {
59 
        ChangeStatus::Added => "A",
60 
        ChangeStatus::Modified => "M",
61 
        ChangeStatus::Removed => "D",
6e723b81 Andy McCall ↶ 62 
        ChangeStatus::Renamed => "R",
fce44ae9 Andy McCall ↶ 63 
        ChangeStatus::ModeChanged => "X",
64 
        ChangeStatus::ConflictEdited => "C!",
6e723b81 Andy McCall ↶ 65 
        ChangeStatus::Resolved => "V",
fce44ae9 Andy McCall ↶ 66 
    }
67 
}
68
b689779e Andy McCall ↶ 69 
/// New untracked files left out of the snapshot for their size (oxygen#98):
70 
/// named, with how to keep them out quietly or take them in.
71 
fn print_skipped_large(repo: &Repo) {
72 
    let skipped = repo.skipped_large();
73 
    if skipped.is_empty() {
74 
        return;
75 
    }
76 
    let size = |n: u64| {
77 
        if n >= 1 << 30 {
78 
            format!("{:.1} GiB", n as f64 / (1u64 << 30) as f64)
79 
        } else {
80 
            format!("{:.0} MiB", n as f64 / (1u64 << 20) as f64)
81 
        }
82 
    };
83 
    println!();
84 
    println!(
85 
        "{} {}",
86 
        ui::section(ui::warn("Not tracked")),
87 
        ui::dim(format!("new files over {}", size(repo.config.max_new_file)))
88 
    );
89 
    for (p, n) in &skipped {
90 
        println!("  {} {}  {}", ui::caution(), ui::path(p), ui::dim(size(*n)));
91 
    }
92 
    println!(
93 
        "  {} {}",
94 
        ui::note(),
95 
        ui::dim(
96 
            "to leave them out quietly, list them in .oxyignore; to track one, \
97 
             raise snapshot.max-new-file-size (oxy config snapshot.max-new-file-size 2G)"
98 
        )
99 
    );
100 
}
101
9b723f69 Andy McCall ↶ 102 
/// Name what a checkout removed from the working copy (oxygen#102): a
103 
/// switch to a bookmark lacking files takes them off disk, which an
104 
/// editor open on the tree notices before a person reading a count does.
105 
fn print_removed(r: &oxy_core::repo::CheckoutReport) {
106 
    if r.removed == 0 {
107 
        return;
108 
    }
109 
    let more = r.removed.saturating_sub(r.removed_paths.len());
110 
    let names = r.removed_paths.join(", ");
111 
    let tail = if more > 0 {
112 
        format!(" and {more} more")
113 
    } else {
114 
        String::new()
115 
    };
116 
    let lead = if r.removed >= 20 {
117 
        ui::caution()
118 
    } else {
119 
        ui::note()
120 
    };
121 
    println!(
122 
        "  {} {}",
123 
        lead,
124 
        ui::dim(format!(
125 
            "removed from disk (the bookmark does not have them): {names}{tail}"
126 
        ))
127 
    );
128 
}
129
d4dbab97 Andy McCall ↶ 130 
/// Folders holding a repository of their own, which oxy leaves out (oxygen#43):
131 
/// named, with how to track them.
132 
fn print_untracked_nested(repo: &Repo, nested: &[String]) {
133 
    if nested.is_empty() {
134 
        return;
135 
    }
136 
    println!();
137 
    println!(
138 
        "{} {}",
139 
        ui::section(ui::warn("Not tracked")),
140 
        ui::dim("folders holding a repository of their own")
141 
    );
142 
    for p in nested {
143 
        let kind = if repo.root().join(p).join(".git").exists() {
144 
            "Git"
145 
        } else {
146 
            "Oxygen"
147 
        };
148 
        println!(
149 
            "  {} {}  {}",
150 
            ui::caution(),
151 
            ui::path(format!("{p}/")),
152 
            ui::dim(format!("a nested {kind} repository"))
153 
        );
154 
    }
155 
    println!(
156 
        "  {} {}",
157 
        ui::note(),
158 
        ui::dim(
159 
            "to track one's files, remove its .git (or .oxy); to keep it a repository of its own, \
69692f14 Andy McCall ↶ 160 
             oxy submodule add URL PATH; to leave it out quietly, list it in .oxyignore"
d4dbab97 Andy McCall ↶ 161 
        )
162 
    );
163 
}
164
36041796 Andy McCall ↶ 165 
/// The working copy's changed paths, or that it is clean.
166 
fn print_statuses(statuses: &[oxy_core::repo::PathStatus]) {
167 
    if statuses.is_empty() {
168 
        println!(
169 
            "  {} {}",
170 
            ui::ok(ui::glyph("✔", "*")),
171 
            ui::dim("nothing to commit, working copy clean")
172 
        );
173 
        return;
174 
    }
175 
    println!();
176 
    for s in statuses {
177 
        println!(
178 
            "  {} {}",
179 
            ui::status_mark(status_tag(s.status)),
180 
            ui::path(&s.path)
181 
        );
182 
    }
183 
}
184
f6dccc45 Andy McCall ↶ 185 
/// Say when the working copy has fallen behind its own bookmark: a
186 
/// "clean" status there hid a pull that left it on old code (oxygen#89).
187 
fn print_behind(repo: &Repo) {
188 
    if let Ok(Some(n)) = repo.working_copy_behind() {
189 
        println!(
190 
            "  {} {}",
191 
            ui::caution(),
192 
            ui::warn(format!(
193 
                "the working copy is behind {}: it lacks {} the bookmark has; oxy checkout brings it up",
194 
                repo.config.bookmark,
195 
                plural(n, "change")
196 
            ))
197 
        );
198 
    }
199 
}
200
50a046e4 Andy McCall ↶ 201 
pub fn status(json: bool) -> Result<i32> {
fce44ae9 Andy McCall ↶ 202 
    let repo = open()?;
36041796 Andy McCall ↶ 203 
    // Answered by the manifest alone, with no history to load (oxygen#35,
204 
    // #41): a clean working copy, or one as the last snapshot left it.
205 
    let known = if json {
206 
        None
207 
    } else {
208 
        repo.status_by_manifest()?
209 
    };
210 
    if let Some(statuses) = known {
da868d5d Andy McCall ↶ 211 
        let (_, wc) = repo.working_copy()?;
212 
        let heads = repo.bookmark_heads()?;
213 
        println!(
214 
            "{} {}{}working copy {}{}{}",
215 
            ui::dim("On"),
216 
            ui::bookmark(&repo.config.bookmark),
217 
            ui::sep(),
218 
            ui::id(wc.change_id.short(8)),
219 
            ui::sep(),
220 
            ui::dim(plural(heads.len(), "head"))
221 
        );
f6dccc45 Andy McCall ↶ 222 
        print_behind(&repo);
36041796 Andy McCall ↶ 223 
        print_statuses(&statuses);
d4dbab97 Andy McCall ↶ 224 
        print_untracked_nested(&repo, &repo.untracked_nested());
b689779e Andy McCall ↶ 225 
        print_skipped_large(&repo);
da868d5d Andy McCall ↶ 226 
        return Ok(0);
227 
    }
135212de Andy McCall ↶ 228 
    let sp = ui::spinner("Snapshotting the working copy…");
cc7a0056 Andy McCall ↶ 229 
    let snap = repo.snapshot_status("oxy status")?;
4cce912a Andy McCall ↶ 230 
    let heads = {
231 
        let _t = oxy_core::timing::phase("status: heads");
232 
        repo.bookmark_heads()?
233 
    };
234 
    let _drop = oxy_core::timing::phase("status: print and drop");
135212de Andy McCall ↶ 235 
    sp.clear();
50a046e4 Andy McCall ↶ 236 
    if json {
237 
        println!("{}", repo.status_json(&snap)?);
75167672 Andy McCall 238 
        return Ok(if snap.base_snapshot.is_conflicted() {
239 
            2
240 
        } else {
241 
            0
242 
        });
50a046e4 Andy McCall ↶ 243 
    }
135212de Andy McCall ↶ 244 
    println!(
94084087 Andy McCall ↶ 245 
        "{} {}{}working copy {}{}{}",
246 
        ui::dim("On"),
247 
        ui::bookmark(&repo.config.bookmark),
248 
        ui::sep(),
135212de Andy McCall ↶ 249 
        ui::id(snap.wc.change_id.short(8)),
94084087 Andy McCall ↶ 250 
        ui::sep(),
251 
        ui::dim(plural(heads.len(), "head"))
135212de Andy McCall ↶ 252 
    );
f6dccc45 Andy McCall ↶ 253 
    print_behind(&repo);
36041796 Andy McCall ↶ 254 
    print_statuses(&snap.statuses);
d4dbab97 Andy McCall ↶ 255 
    print_untracked_nested(&repo, &snap.untracked_nested);
b689779e Andy McCall ↶ 256 
    print_skipped_large(&repo);
fce44ae9 Andy McCall ↶ 257 
    if !snap.base_snapshot.is_conflicted() {
258 
        return Ok(0);
259 
    }
135212de Andy McCall ↶ 260 
    println!();
75167672 Andy McCall 261 
    println!(
262 
        "{} {}",
263 
        ui::section(ui::err("Conflicts")),
264 
        ui::dim("edit the marked files, or the .oxy-conflict-N candidates, then commit")
265 
    );
fce44ae9 Andy McCall ↶ 266 
    for c in &snap.base_snapshot.tree.conflicts {
94084087 Andy McCall ↶ 267 
        println!("  {} tree: {c:?}", ui::err(ui::glyph("✱", "!")));
fce44ae9 Andy McCall ↶ 268 
    }
269 
    for (p, f) in &snap.base_snapshot.files {
270 
        if f.is_conflicted() {
75167672 Andy McCall 271 
            let state = match snap
272 
                .statuses
273 
                .iter()
274 
                .find(|s| s.path == *p)
275 
                .map(|s| s.status)
276 
            {
277 
                Some(ChangeStatus::Resolved) => {
278 
                    ui::ok(format!("{} resolved in working copy", ui::glyph("✔", "*")))
279 
                }
280 
                Some(ChangeStatus::ConflictEdited) => {
281 
                    ui::warn(format!("{} markers remain", ui::glyph("‼", "!")))
282 
                }
94084087 Andy McCall ↶ 283 
                _ => ui::err(format!("{} unresolved", ui::glyph("✱", "!"))),
fce44ae9 Andy McCall ↶ 284 
            };
135212de Andy McCall ↶ 285 
            println!("  {}  {state}", ui::path(p));
fce44ae9 Andy McCall ↶ 286 
        }
287 
    }
288 
    Ok(2)
289 
}
290
75167672 Andy McCall 291 
pub fn commit(
292 
    message: &str,
293 
    depends_on: &[String],
294 
    paths: &[String],
295 
    interactive: bool,
296 
    hunks: &[usize],
297 
) -> Result<i32> {
fce44ae9 Andy McCall ↶ 298 
    let repo = open()?;
299 
    let mut deps = Vec::new();
300 
    for d in depends_on {
301 
        deps.push(repo.resolve_change(d)?);
302 
    }
c6aa5bd9 Andy McCall ↶ 303 
    let selection = if !hunks.is_empty() {
304 
        oxy_core::repo::Selection::Hunks(hunks.to_vec())
305 
    } else if interactive {
957fee30 Andy McCall ↶ 306 
        let (_, hunks) = repo.hunks()?;
307 
        if hunks.is_empty() {
308 
            anyhow::bail!("nothing to commit: the working copy matches its base");
309 
        }
75167672 Andy McCall 310 
        let hunks: Vec<_> = hunks
311 
            .into_iter()
312 
            .filter(|h| {
313 
                paths.is_empty()
314 
                    || paths.iter().any(|p| {
315 
                        h.path == *p || h.path.starts_with(&format!("{}/", p.trim_end_matches('/')))
316 
                    })
317 
            })
318 
            .collect();
957fee30 Andy McCall ↶ 319 
        let mut chosen = Vec::new();
320 
        let stdin = std::io::stdin();
321 
        let mut take_rest = false;
322 
        for (n, h) in hunks.iter().enumerate() {
323 
            if take_rest {
324 
                chosen.push(h.index);
325 
                continue;
326 
            }
75167672 Andy McCall 327 
            println!(
328 
                "{} {} {}",
329 
                ui::section(format!("hunk {} of {}", n + 1, hunks.len())),
330 
                ui::path(&h.path),
331 
                ui::dim(format!("(#{})", h.index))
332 
            );
957fee30 Andy McCall ↶ 333 
            for line in h.text.lines() {
75167672 Andy McCall 334 
                let styled = if line.starts_with('+') {
335 
                    ui::ok(line)
336 
                } else if line.starts_with('-') {
337 
                    ui::err(line)
338 
                } else {
339 
                    ui::dim(line)
340 
                };
957fee30 Andy McCall ↶ 341 
                println!("  {styled}");
342 
            }
343 
            loop {
75167672 Andy McCall 344 
                print!(
345 
                    "{} ",
346 
                    ui::warn("Commit this hunk? [y]es [n]o [a]ll remaining [q]uit:")
347 
                );
957fee30 Andy McCall ↶ 348 
                use std::io::Write as _;
349 
                std::io::stdout().flush()?;
350 
                let mut answer = String::new();
351 
                if stdin.read_line(&mut answer)? == 0 {
352 
                    anyhow::bail!("aborted");
353 
                }
354 
                match answer.trim() {
355 
                    "y" | "Y" => {
356 
                        chosen.push(h.index);
357 
                        break;
358 
                    }
359 
                    "n" | "N" | "" => break,
360 
                    "a" | "A" => {
361 
                        chosen.push(h.index);
362 
                        take_rest = true;
363 
                        break;
364 
                    }
365 
                    "q" | "Q" => anyhow::bail!("aborted; nothing committed"),
366 
                    _ => continue,
367 
                }
368 
            }
369 
        }
370 
        if chosen.is_empty() {
371 
            anyhow::bail!("no hunks chosen; nothing committed");
372 
        }
373 
        oxy_core::repo::Selection::Hunks(chosen)
374 
    } else if paths.is_empty() {
375 
        oxy_core::repo::Selection::All
376 
    } else {
377 
        oxy_core::repo::Selection::Paths(paths.to_vec())
378 
    };
135212de Andy McCall ↶ 379 
    let sp = ui::spinner("Committing…");
75051941 Andy McCall ↶ 380 
    let (h, partial) = repo.commit_selection_partial(message, &deps, &selection)?;
5b4c5130 Andy McCall ↶ 381 
    // The metadata only: a first commit's change holds the whole tree.
382 
    let meta = repo.store().get_change_meta(&h)?;
75167672 Andy McCall 383 
    sp.done(&format!(
384 
        "{} {} {}  {}",
385 
        ui::done("Committed"),
5b4c5130 Andy McCall ↶ 386 
        ui::id(meta.change_id.short(8)),
75167672 Andy McCall 387 
        ui::hash(format!("#{}", h.short(12))),
388 
        ui::subject(subject_of(message))
389 
    ));
d4dbab97 Andy McCall ↶ 390 
    print_untracked_nested(&repo, &repo.untracked_nested());
b689779e Andy McCall ↶ 391 
    print_skipped_large(&repo);
75051941 Andy McCall ↶ 392 
    // Only a commit that took part of the working copy leaves anything.
393 
    if partial {
8ab265dc Andy McCall ↶ 394 
        let rest = repo.snapshot_status("oxy commit")?;
957fee30 Andy McCall ↶ 395 
        if !rest.statuses.is_empty() {
75167672 Andy McCall 396 
            println!(
397 
                "  {} {}",
398 
                ui::note(),
399 
                ui::dim(format!(
400 
                    "{} left uncommitted",
401 
                    plural(rest.statuses.len(), "path")
402 
                ))
403 
            );
957fee30 Andy McCall ↶ 404 
        }
405 
    }
98a1620a Andy McCall ↶ 406 
    where_now(&repo);
957fee30 Andy McCall ↶ 407 
    Ok(0)
408 
}
409
410 
pub fn blame(path: &str, json: bool) -> Result<i32> {
411 
    let repo = open()?;
412 
    let lines = repo.blame(path)?;
413 
    if json {
414 
        let items = lines.iter().map(|l| {
415 
            format!(
416 
                "{{\"line\":{},\"change_id\":{},\"hash\":{},\"index\":{},\"author\":{},\"when_ms\":{}}}",
417 
                l.line,
418 
                oxy_core::repo::json_str(&l.change_id.to_hex()),
419 
                oxy_core::repo::json_str(&l.hash.to_hex()),
420 
                l.index,
421 
                oxy_core::repo::json_str(&l.author),
422 
                l.when_ms
423 
            )
424 
        });
425 
        println!("{}", oxy_core::repo::json_array(items));
426 
        return Ok(0);
427 
    }
75167672 Andy McCall 428 
    let width = lines
429 
        .iter()
430 
        .map(|l| l.author.chars().count())
431 
        .max()
432 
        .unwrap_or(0)
433 
        .min(20);
957fee30 Andy McCall ↶ 434 
    let digits = lines.len().to_string().len();
fddf64ba Andy McCall ↶ 435 
    let _t = oxy_core::timing::phase("blame: print");
436 
    // Most lines share their change with many others: each change's id,
437 
    // author and age are formatted once, and the lines go out through one
438 
    // buffered lock on stdout.
439 
    let mut prefix: std::collections::HashMap<oxy_core::hash::ChangeHash, String> =
440 
        std::collections::HashMap::new();
441 
    let bar = ui::dim(ui::glyph("│", "|"));
442 
    let mut out = std::io::BufWriter::with_capacity(1 << 16, std::io::stdout().lock());
957fee30 Andy McCall ↶ 443 
    for l in &lines {
fddf64ba Andy McCall ↶ 444 
        let p = prefix.entry(l.hash).or_insert_with(|| {
445 
            let author: String = l.author.chars().take(20).collect();
446 
            format!(
447 
                "{} {} {}",
448 
                ui::id(l.change_id.short(8)),
449 
                ui::author(format!("{author:<width$}")),
450 
                ui::dim(ui::ago(l.when_ms))
451 
            )
452 
        });
957fee30 Andy McCall ↶ 453 
        let text = String::from_utf8_lossy(&l.text);
fddf64ba Andy McCall ↶ 454 
        if writeln!(
455 
            out,
456 
            "{p} {:>digits$}{bar} {}",
957fee30 Andy McCall ↶ 457 
            l.line,
458 
            text.trim_end_matches('\n')
fddf64ba Andy McCall ↶ 459 
        )
460 
        .is_err()
461 
        {
462 
            // A closed pipe (blame | head): stop quietly.
463 
            return Ok(0);
464 
        }
957fee30 Andy McCall ↶ 465 
    }
fddf64ba Andy McCall ↶ 466 
    let _ = out.flush();
957fee30 Andy McCall ↶ 467 
    Ok(0)
468 
}
469
470 
fn bisect_report(repo: &Repo, step: &oxy_core::repo::BisectStep) -> Result<i32> {
471 
    use oxy_core::repo::BisectStep::*;
472 
    match step {
473 
        NeedMarks { good, bad } => {
75167672 Andy McCall 474 
            println!(
475 
                "{} {} {}",
476 
                ui::note(),
477 
                ui::dim(format!("{good} good, {bad} bad;")),
478 
                ui::dim(if *good == 0 {
479 
                    "mark a known-good change or bookmark: oxy bisect good CHANGE"
480 
                } else {
481 
                    "mark a known-bad change or bookmark: oxy bisect bad CHANGE"
482 
                })
483 
            );
957fee30 Andy McCall ↶ 484 
            Ok(0)
485 
        }
75167672 Andy McCall 486 
        Testing {
487 
            heads,
488 
            remaining,
489 
            steps_left,
490 
        } => {
491 
            println!(
492 
                "{} {} {}",
493 
                ui::done("Testing"),
494 
                ui::dim(format!(
495 
                    "{} in the state under test;",
496 
                    plural(heads.len(), "head")
497 
                )),
498 
                ui::dim(format!(
499 
                    "{remaining} candidates left, about {steps_left} more steps"
500 
                ))
501 
            );
502 
            println!(
503 
                "  {} {}",
504 
                ui::note(),
505 
                ui::dim("run your test, then oxy bisect good | bad | skip")
506 
            );
957fee30 Andy McCall ↶ 507 
            Ok(0)
508 
        }
509 
        Found { culprit } => {
510 
            let c = repo.store().get_change(culprit)?;
75167672 Andy McCall 511 
            println!(
512 
                "{} {} {}  {}",
513 
                ui::done("Found"),
514 
                ui::id(short_id(&c)),
515 
                ui::hash(format!("#{}", culprit.short(12))),
516 
                ui::subject(subject_of(&c.message))
517 
            );
957fee30 Andy McCall ↶ 518 
            println!("  {} {}", ui::note(), ui::dim("the first change whose inclusion makes the state bad; oxy bisect reset to return"));
519 
            Ok(0)
520 
        }
521 
        Inconclusive { candidates } => {
75167672 Andy McCall 522 
            println!(
523 
                "{} {}",
524 
                ui::caution(),
525 
                ui::warn(format!(
526 
                    "every remaining candidate was skipped ({}); oxy bisect reset to return",
527 
                    plural(candidates.len(), "change")
528 
                ))
529 
            );
957fee30 Andy McCall ↶ 530 
            Ok(1)
531 
        }
532 
    }
533 
}
534
535 
pub fn bisect_start() -> Result<i32> {
536 
    let repo = open()?;
537 
    repo.bisect_start()?;
75167672 Andy McCall 538 
    println!(
539 
        "{} bisect; {}",
540 
        ui::done("Started"),
541 
        ui::dim("now: oxy bisect good CHANGE and oxy bisect bad CHANGE")
542 
    );
957fee30 Andy McCall ↶ 543 
    Ok(0)
544 
}
545
546 
pub fn bisect_mark(good: Option<bool>, changes: &[String]) -> Result<i32> {
547 
    let repo = open()?;
548 
    let mut heads = Vec::new();
549 
    for c in changes {
550 
        heads.extend(repo.resolve_heads(c)?);
551 
    }
552 
    let step = repo.bisect_mark(good, &heads)?;
553 
    bisect_report(&repo, &step)
554 
}
555
556 
pub fn bisect_run(command: &[String]) -> Result<i32> {
557 
    let repo = open()?;
558 
    let step = repo.bisect_run(command)?;
559 
    bisect_report(&repo, &step)
560 
}
561
c6aa5bd9 Andy McCall ↶ 562 
pub fn bisect_status(as_json: bool) -> Result<i32> {
957fee30 Andy McCall ↶ 563 
    let repo = open()?;
c6aa5bd9 Andy McCall ↶ 564 
    if as_json {
565 
        use oxy_core::repo::BisectStep::*;
566 
        let v = match repo.bisect_status()? {
567 
            None => "null".to_string(),
75167672 Andy McCall 568 
            Some(NeedMarks { good, bad }) => json::obj([
569 
                ("state", json::s("need-marks")),
570 
                ("good", json::n(good)),
571 
                ("bad", json::n(bad)),
572 
            ]),
573 
            Some(Testing {
574 
                heads,
575 
                remaining,
576 
                steps_left,
577 
            }) => json::obj([
578 
                ("state", json::s("testing")),
579 
                ("heads", json::hashes(&heads)),
580 
                ("remaining", json::n(remaining)),
581 
                ("steps_left", json::n(steps_left)),
582 
            ]),
583 
            Some(Found { culprit }) => json::obj([
584 
                ("state", json::s("found")),
585 
                ("culprit", json::s(&culprit.to_hex())),
586 
            ]),
587 
            Some(Inconclusive { candidates }) => json::obj([
588 
                ("state", json::s("inconclusive")),
589 
                ("candidates", json::hashes(&candidates)),
590 
            ]),
c6aa5bd9 Andy McCall ↶ 591 
        };
592 
        println!("{v}");
593 
        return Ok(0);
594 
    }
957fee30 Andy McCall ↶ 595 
    match repo.bisect_status()? {
596 
        None => {
597 
            println!("{}", ui::dim("No bisect in progress."));
598 
            Ok(0)
599 
        }
600 
        Some(step) => bisect_report(&repo, &step),
601 
    }
602 
}
603
604 
pub fn bisect_reset() -> Result<i32> {
605 
    let repo = open()?;
606 
    repo.bisect_reset()?;
607 
    println!("{} bisect; working copy restored", ui::done("Reset"));
fce44ae9 Andy McCall ↶ 608 
    Ok(0)
609 
}
610
94084087 Andy McCall ↶ 611 
/// The log: one entry per change, newest first, joined by a rail. The
612 
/// default view is the subject and a metadata line; `verbose` adds the full
613 
/// message, dependencies, and the authenticating key.
c6aa5bd9 Andy McCall ↶ 614 
fn signature_json(repo: &Repo, h: &oxy_core::hash::ChangeHash) -> Result<String> {
615 
    Ok(match repo.authenticate_change(h)? {
616 
        SignatureStatus::Unsigned => json::obj([("status", json::s("unsigned"))]),
75167672 Andy McCall 617 
        SignatureStatus::Valid {
618 
            key,
619 
            name,
620 
            email,
621 
            sealed,
622 
            revoked,
623 
        } => json::obj([
c6aa5bd9 Andy McCall ↶ 624 
            ("status", json::s(if sealed { "sealed" } else { "signed" })),
625 
            ("key", json::s(&key.to_hex())),
626 
            ("name", json::s(&name)),
627 
            ("email", json::s(&email)),
628 
            ("revoked", json::b(revoked)),
629 
        ]),
75167672 Andy McCall 630 
        SignatureStatus::Invalid(why) => {
631 
            json::obj([("status", json::s("invalid")), ("reason", json::s(&why))])
632 
        }
c6aa5bd9 Andy McCall ↶ 633 
    })
634 
}
635
636 
fn log_entry_json(repo: &Repo, e: &oxy_core::repo::LogEntry) -> Result<String> {
637 
    let c = &e.change;
638 
    Ok(json::obj([
639 
        ("hash", json::s(&e.hash.to_hex())),
640 
        ("change_id", json::s(&c.change_id.to_hex())),
641 
        ("author", json::s(&author_name(repo, c))),
642 
        ("author_key", json::s(&c.author.to_hex())),
5cde7882 Andy McCall ↶ 643 
        (
644 
            "via",
645 
            match via(
646 
                repo,
647 
                &repo.authenticate_change_known(&e.hash, Some(c))?,
648 
                &c.author,
649 
            ) {
650 
                Some(v) => json::obj([
651 
                    ("name", json::s(&v.name)),
652 
                    ("email", json::s(&v.email)),
653 
                    ("key", json::s(&v.key.to_hex())),
654 
                    ("scope", json::opt(v.scope.as_deref(), json::s)),
655 
                    ("expires_ms", json::opt(v.expires, json::n)),
656 
                    ("revoked", json::b(v.revoked)),
657 
                ]),
658 
                None => "null".to_string(),
659 
            },
660 
        ),
c6aa5bd9 Andy McCall ↶ 661 
        ("when_ms", json::n(c.hlc.wall_ms)),
662 
        ("message", json::s(&c.message)),
663 
        ("kind", json::s(&format!("{:?}", c.kind).to_lowercase())),
664 
        ("deps", json::hashes(&c.deps)),
665 
        ("head", json::b(e.is_head)),
666 
        ("working_copy", json::b(e.is_working_copy)),
75167672 Andy McCall 667 
        (
668 
            "signature",
669 
            if e.is_working_copy {
670 
                "null".into()
671 
            } else {
672 
                signature_json(repo, &e.hash)?
673 
            },
674 
        ),
c6aa5bd9 Andy McCall ↶ 675 
    ]))
676 
}
677
83d61e80 Andy McCall ↶ 678 
/// `START,END:PATH` for `oxy log -L`.
679 
fn parse_line_range(spec: &str) -> Result<(usize, usize, &str)> {
680 
    let bad = || anyhow::anyhow!("-L {spec}: expected START,END:PATH, as 10,24:src/lib.rs");
681 
    let (range, path) = spec.split_once(':').ok_or_else(bad)?;
682 
    let (a, b) = range.split_once(',').ok_or_else(bad)?;
683 
    Ok((
684 
        a.trim().parse().map_err(|_| bad())?,
685 
        b.trim().parse().map_err(|_| bad())?,
686 
        path,
687 
    ))
688 
}
689
690 
pub fn log(
47ce8b8e Andy McCall ↶ 691 
    revset: Option<&str>,
83d61e80 Andy McCall ↶ 692 
    limit: Option<usize>,
693 
    verbose: bool,
694 
    path: Option<&str>,
695 
    lines: Option<&str>,
696 
    as_json: bool,
697 
) -> Result<i32> {
fce44ae9 Andy McCall ↶ 698 
    let repo = open()?;
69816d68 Andy McCall ↶ 699 
    // Whether the working copy is clean and conflicted: from the manifest
700 
    // when it proves the working copy clean, else from a snapshot.
33472ccc Andy McCall ↶ 701 
    // The working copy as last recorded, without looking at the files (as
702 
    // Git's log does not): whether its change holds edits, and whether its
703 
    // base was conflicted. `oxy status` is what checks the disk.
704 
    let conflicted = !repo.is_at_op() && repo.recorded_conflicted()?;
4cce912a Andy McCall ↶ 705 
    let listing = oxy_core::timing::phase("log: entries");
83d61e80 Andy McCall ↶ 706 
    let entries = match (path, lines) {
47ce8b8e Andy McCall ↶ 707 
        _ if revset.is_some() => repo.log_revset(revset.unwrap_or_default())?,
83d61e80 Andy McCall ↶ 708 
        (_, Some(spec)) => {
709 
            let (first, last, p) = parse_line_range(spec)?;
69816d68 Andy McCall ↶ 710 
            let (_, wc) = repo.working_copy()?;
711 
            let base = repo.load_state_history(&wc.deps)?.maximal(&wc.deps);
712 
            repo.line_history(&base, p, first, last)?
83d61e80 Andy McCall ↶ 713 
        }
714 
        (Some(p), None) => repo.log_for_path(p)?,
715 
        (None, None) => repo.log()?,
c6aa5bd9 Andy McCall ↶ 716 
    };
4cce912a Andy McCall ↶ 717 
    drop(listing);
718 
    let _print = oxy_core::timing::phase("log: print");
c6aa5bd9 Andy McCall ↶ 719 
    if as_json {
720 
        let shown = limit.unwrap_or(entries.len()).min(entries.len());
721 
        let mut items = Vec::new();
722 
        for e in entries.iter().take(shown) {
723 
            items.push(log_entry_json(&repo, e)?);
724 
        }
75167672 Andy McCall 725 
        println!(
726 
            "{}",
727 
            json::obj([
728 
                ("bookmark", json::s(&repo.config.bookmark)),
729 
                ("total", json::n(entries.len())),
730 
                ("changes", json::arr(items))
731 
            ])
732 
        );
c6aa5bd9 Andy McCall ↶ 733 
        return Ok(0);
734 
    }
94084087 Andy McCall ↶ 735 
    let total = entries.len();
736 
    let shown = limit.unwrap_or(total).min(total);
2bf22305 Andy McCall ↶ 737 
    // Lay out a little past what is shown, so edges into the cut are drawn.
738 
    let window: Vec<(ChangeHash, Vec<ChangeHash>)> = entries
739 
        .iter()
740 
        .take((shown + MAX_EDGE).min(total))
741 
        .map(|e| (e.hash, e.change.deps.clone()))
742 
        .collect();
743 
    let rows = oxy_core::lanes::graph(&window, MAX_EDGE);
744 
    // Highlight the shortest prefix that names each change: against the
745 
    // whole log, which is what `resolve_change` searches.
746 
    let everything;
47ce8b8e Andy McCall ↶ 747 
    let all = if path.is_some() || lines.is_some() || revset.is_some() {
2bf22305 Andy McCall ↶ 748 
        everything = repo.log()?;
749 
        &everything
750 
    } else {
751 
        &entries
752 
    };
79b5a90f Andy McCall ↶ 753 
    let prefixes = oxy_core::timing::phase("log: id prefixes");
754 
    let id_prefix = id_prefixes(
755 
        all.iter().map(|e| e.change.change_id.0).collect(),
756 
        entries.iter().take(shown).map(|e| e.change.change_id.0),
757 
    );
758 
    drop(prefixes);
2bf22305 Andy McCall ↶ 759 
    let labels = reference_labels(&repo)?;
760 
    for (e, row) in entries.iter().take(shown).zip(&rows) {
fce44ae9 Andy McCall ↶ 761 
        let c = &e.change;
75167672 Andy McCall 762 
        let bullet = ui::log_bullet(
763 
            e.is_working_copy,
764 
            e.is_head,
765 
            e.is_working_copy && conflicted,
766 
        );
2bf22305 Andy McCall ↶ 767 
        let id = c.change_id.to_hex();
79b5a90f Andy McCall ↶ 768 
        let n = id_prefix.get(&c.change_id.0).copied().unwrap_or(8).min(8);
2bf22305 Andy McCall ↶ 769 
        let mut head = vec![format!("{}{}", ui::id(&id[..n]), ui::dim(&id[n..8]))];
770 
        head.push(ui::author(author_name(&repo, c)));
771 
        head.push(ui::dim(ui::ago(c.hlc.wall_ms)));
772 
        if let Some(names) = labels.get(&e.hash) {
773 
            head.push(names.join(" "));
fce44ae9 Andy McCall ↶ 774 
        }
94084087 Andy McCall ↶ 775 
        if c.kind == ChangeKind::Resolution {
2bf22305 Andy McCall ↶ 776 
            head.push(ui::warn("resolution"));
fce44ae9 Andy McCall ↶ 777 
        }
2bf22305 Andy McCall ↶ 778 
        if !e.is_working_copy {
779 
            head.push(ui::hash(format!("#{}", e.hash.short(8))));
5cde7882 Andy McCall ↶ 780 
            let status = repo.authenticate_change_known(&e.hash, Some(c))?;
781 
            if let Some(agent) = via(&repo, &status, &c.author) {
782 
                head.push(ui::dim(format!("via {}", agent.name)));
783 
            }
784 
            head.push(signature_mark_of(&status));
2bf22305 Andy McCall ↶ 785 
        }
786 
        println!("{}{}", node_line(row, &bullet), head.join(" "));
94084087 Andy McCall ↶ 787 
        let subject = if e.is_working_copy && c.message.is_empty() {
33472ccc Andy McCall ↶ 788 
            let edited = repo
789 
                .store()
790 
                .get_change(&e.hash)
791 
                .is_ok_and(|w| !w.tree_ops.is_empty() || !w.edits.is_empty());
792 
            ui::dim(if edited {
2bf22305 Andy McCall ↶ 793 
                "(working copy, uncommitted changes)"
33472ccc Andy McCall ↶ 794 
            } else {
795 
                "(working copy)"
75167672 Andy McCall 796 
            })
2bf22305 Andy McCall ↶ 797 
        } else if c.message.trim().is_empty() {
798 
            ui::dim("(no description)")
94084087 Andy McCall ↶ 799 
        } else {
2bf22305 Andy McCall ↶ 800 
            subject_of(&c.message).to_string()
94084087 Andy McCall ↶ 801 
        };
2bf22305 Andy McCall ↶ 802 
        println!("{}{subject}", below_line(row));
94084087 Andy McCall ↶ 803 
        if verbose {
2bf22305 Andy McCall ↶ 804 
            let rail = continuation(row);
94084087 Andy McCall ↶ 805 
            if !e.is_working_copy {
75167672 Andy McCall 806 
                println!(
2bf22305 Andy McCall ↶ 807 
                    "{rail}{}",
75167672 Andy McCall 808 
                    ui::dim(format!(
809 
                        "{} {}",
810 
                        when(c.hlc.wall_ms),
811 
                        signature_line(&repo, &e.hash)?
812 
                    ))
813 
                );
94084087 Andy McCall ↶ 814 
            }
815 
            if !c.deps.is_empty() {
75167672 Andy McCall 816 
                println!(
2bf22305 Andy McCall ↶ 817 
                    "{rail}{} {}",
75167672 Andy McCall 818 
                    ui::dim(ui::glyph("↳", "->")),
819 
                    ui::dim(deps_of(&c.deps))
820 
                );
94084087 Andy McCall ↶ 821 
            }
75167672 Andy McCall 822 
            let body: Vec<&str> = c
823 
                .message
824 
                .lines()
825 
                .skip(1)
826 
                .skip_while(|l| l.trim().is_empty())
827 
                .collect();
2bf22305 Andy McCall ↶ 828 
            for line in body {
829 
                println!("{rail}  {line}");
94084087 Andy McCall ↶ 830 
            }
fce44ae9 Andy McCall ↶ 831 
        }
832 
    }
94084087 Andy McCall ↶ 833 
    if shown < total {
2bf22305 Andy McCall ↶ 834 
        if let Some(last) = rows.get(shown.saturating_sub(1)) {
835 
            let cut: String = last
836 
                .below
837 
                .iter()
838 
                .map(|c| match c {
839 
                    Cell::Blank | Cell::Elided | Cell::JoinRight => "  ",
840 
                    _ => "~ ",
841 
                })
842 
                .collect();
843 
            if cut.trim().is_empty() {
844 
                println!("{}", ui::dim("~"));
845 
            } else {
846 
                println!("{}", ui::dim(cut.trim_end()));
847 
            }
848 
        }
75167672 Andy McCall 849 
        println!(
850 
            "{}",
851 
            ui::dim(format!(
852 
                "{} {} more; pass -n to see them",
853 
                ui::glyph("…", "..."),
854 
                total - shown
855 
            ))
856 
        );
94084087 Andy McCall ↶ 857 
    }
fce44ae9 Andy McCall ↶ 858 
    Ok(0)
2bf22305 Andy McCall ↶ 859 
}
860
861 
/// Rows a drawn edge may span in `oxy log`; a longer one is elided (`~`).
862 
const MAX_EDGE: usize = 12;
863
864 
use oxy_core::hash::ChangeHash;
865 
use oxy_core::lanes::{Cell, GraphRow};
866
867 
/// A graph cell, two columns wide.
868 
fn cell(c: Cell) -> &'static str {
869 
    match c {
870 
        Cell::Blank => "  ",
871 
        Cell::Line => ui::glyph("│ ", "| "),
872 
        Cell::Elided => "~ ",
873 
        Cell::JoinLeft => ui::glyph("├─", "|-"),
874 
        Cell::JoinPass => ui::glyph("──", "--"),
875 
        Cell::JoinCross => ui::glyph("┼─", "+-"),
876 
        Cell::JoinRight => ui::glyph("╯ ", "' "),
877 
    }
878 
}
879
880 
/// The graph part of a change's own line, its bullet in its column.
881 
fn node_line(row: &GraphRow, bullet: &str) -> String {
882 
    let width = row
883 
        .passing
884 
        .iter()
885 
        .copied()
886 
        .max()
887 
        .unwrap_or(0)
888 
        .max(row.column)
889 
        + 1;
890 
    let mut out = String::new();
891 
    for c in 0..width {
892 
        if c == row.column {
893 
            out.push_str(bullet);
894 
            out.push(' ');
895 
        } else if row.passing.contains(&c) {
896 
            out.push_str(&ui::dim(cell(Cell::Line)));
897 
        } else {
898 
            out.push_str("  ");
899 
        }
900 
    }
901 
    out.push(' ');
902 
    out
903 
}
904
905 
/// The graph part of the line under a change: lanes carrying on, a join,
906 
/// or `~` for an elided edge.
907 
fn below_line(row: &GraphRow) -> String {
908 
    let g: String = row.below.iter().map(|c| cell(*c)).collect();
909 
    format!("{} ", ui::dim(g))
910 
}
911
912 
/// The graph part of any further line of a change (`-v`).
913 
fn continuation(row: &GraphRow) -> String {
914 
    let g: String = row
915 
        .below
916 
        .iter()
917 
        .map(|c| match c {
918 
            Cell::Line | Cell::JoinLeft | Cell::JoinCross => cell(Cell::Line),
919 
            _ => "  ",
920 
        })
921 
        .collect();
922 
    format!("{} ", ui::dim(g))
923 
}
924
925 
/// For each hex ID, the length of its shortest prefix no other ID shares.
79b5a90f Andy McCall ↶ 926 
/// The shortest prefix, in hex digits, that names each of `wanted` among
927 
/// `all`: worked out for the few shown rather than for the whole history.
928 
fn id_prefixes(
929 
    mut all: Vec<[u8; 16]>,
930 
    wanted: impl Iterator<Item = [u8; 16]>,
931 
) -> std::collections::HashMap<[u8; 16], usize> {
932 
    all.sort_unstable();
933 
    all.dedup();
934 
    // Hex digits two ids share at the start.
935 
    let common = |a: &[u8; 16], b: &[u8; 16]| {
936 
        let bytes = a.iter().zip(b).take_while(|(x, y)| x == y).count();
937 
        match (a.get(bytes), b.get(bytes)) {
938 
            (Some(x), Some(y)) if x >> 4 == y >> 4 => 2 * bytes + 1,
939 
            _ => 2 * bytes,
940 
        }
941 
    };
942 
    let mut out = std::collections::HashMap::new();
943 
    for id in wanted {
944 
        let Ok(i) = all.binary_search(&id) else {
945 
            continue;
946 
        };
947 
        let before = i.checked_sub(1).map_or(0, |j| common(&all[j], &id));
948 
        let after = all.get(i + 1).map_or(0, |n| common(&id, n));
949 
        out.insert(id, before.max(after) + 1);
950 
    }
951 
    out
952 
}
953
2bf22305 Andy McCall ↶ 954 
fn unique_prefixes(ids: impl Iterator<Item = String>) -> std::collections::HashMap<String, usize> {
955 
    let mut v: Vec<String> = ids.collect();
956 
    v.sort();
957 
    v.dedup();
958 
    let common = |a: &str, b: &str| a.bytes().zip(b.bytes()).take_while(|(x, y)| x == y).count();
959 
    let mut out = std::collections::HashMap::with_capacity(v.len());
960 
    for i in 0..v.len() {
961 
        let before = if i > 0 { common(&v[i - 1], &v[i]) } else { 0 };
962 
        let after = if i + 1 < v.len() {
963 
            common(&v[i], &v[i + 1])
964 
        } else {
965 
            0
966 
        };
967 
        out.insert(v[i].clone(), before.max(after) + 1);
968 
    }
969 
    out
970 
}
971
972 
/// Bookmark, remote bookmark and tag names to show beside the changes they
973 
/// point at. A name is shown on each head of its state; one with more than
974 
/// three heads names too much of the log to help, so it is left out (oxy
975 
/// bookmark list shows it). A remote bookmark at the same state as the
976 
/// local one of that name is not repeated.
977 
fn reference_labels(repo: &Repo) -> Result<std::collections::HashMap<ChangeHash, Vec<String>>> {
978 
    const MAX_HEADS: usize = 3;
979 
    let view = repo.view()?;
980 
    let mut out: std::collections::HashMap<ChangeHash, Vec<String>> = Default::default();
981 
    let mut add = |heads: Vec<ChangeHash>, label: String| {
982 
        if heads.len() <= MAX_HEADS {
983 
            for h in heads {
984 
                out.entry(h).or_default().push(label.clone());
985 
            }
986 
        }
987 
    };
988 
    for (name, st) in &view.bookmarks {
989 
        add(repo.store().get_state(st)?.heads, ui::bookmark(name));
990 
    }
991 
    for (remote, bookmarks) in &view.remotes {
992 
        for (name, st) in bookmarks {
993 
            if view.bookmarks.get(name) == Some(st) {
994 
                continue;
995 
            }
996 
            add(
997 
                repo.store().get_state(st)?.heads,
998 
                ui::dim(format!("{remote}/{name}")),
999 
            );
1000 
        }
1001 
    }
1002 
    for t in repo.tags()? {
1003 
        add(t.heads.clone(), ui::warn(&t.name));
1004 
    }
1005 
    Ok(out)
fce44ae9 Andy McCall ↶ 1006 
}
1007
c6aa5bd9 Andy McCall ↶ 1008 
pub fn diff(change: Option<&str>, as_json: bool) -> Result<i32> {
1009 
    let repo = open()?;
1010 
    let hash = change.map(|c| repo.resolve_change(c)).transpose()?;
1011 
    if as_json {
1012 
        let files = repo.diff_files(hash.as_ref())?;
1013 
        let items = files.iter().map(|f| {
1014 
            json::obj([
1015 
                ("path", json::s(&f.path)),
1016 
                ("kind", json::s(&f.kind)),
1017 
                ("from", json::opt(f.from.as_deref(), json::s)),
1018 
                (
1019 
                    "hunks",
1020 
                    json::arr(f.hunks.iter().map(|h| {
1021 
                        json::obj([
1022 
                            ("base_line", json::n(h.base_line)),
75167672 Andy McCall 1023 
                            (
1024 
                                "added",
1025 
                                json::arr(
1026 
                                    h.added.iter().map(|l| json::s(&String::from_utf8_lossy(l))),
1027 
                                ),
1028 
                            ),
1029 
                            (
1030 
                                "removed",
1031 
                                json::arr(h.removed.iter().map(|(n, l)| {
1032 
                                    json::obj([
1033 
                                        ("line", json::n(*n)),
1034 
                                        ("text", json::s(&String::from_utf8_lossy(l))),
1035 
                                    ])
1036 
                                })),
1037 
                            ),
c6aa5bd9 Andy McCall ↶ 1038 
                        ])
1039 
                    })),
1040 
                ),
1041 
            ])
1042 
        });
75167672 Andy McCall 1043 
        println!(
1044 
            "{}",
1045 
            json::obj([
1046 
                ("change", json::opt(hash, |h| json::s(&h.to_hex()))),
1047 
                ("files", json::arr(items))
1048 
            ])
1049 
        );
c6aa5bd9 Andy McCall ↶ 1050 
        return Ok(0);
1051 
    }
1052 
    match hash {
1053 
        Some(h) => {
1054 
            let c = repo.store().get_change(&h)?;
8ab265dc Andy McCall ↶ 1055 
            let (base, snapshot) = repo.change_base(&c)?;
c6aa5bd9 Andy McCall ↶ 1056 
            print!("{}", render_change(&c, &base, &snapshot));
1057 
        }
1058 
        None => {
74b4a3c6 Andy McCall ↶ 1059 
            // Nothing changed: nothing to show, and no base to load.
1060 
            let Some((wc, base, snapshot)) = repo.working_copy_with_base_unless_unchanged()? else {
1061 
                return Ok(0);
1062 
            };
10b4fd43 Andy McCall ↶ 1063 
            let text = {
1064 
                let _t = oxy_core::timing::phase("diff: render the change");
1065 
                render_change(&wc, &base, &snapshot)
1066 
            };
1067 
            print!("{text}");
1068 
            // The process ends here: freeing the base's tree and graphs
1069 
            // one by one would only cost time (about 27 ms on Linux).
1070 
            std::mem::forget((wc, base, snapshot));
c6aa5bd9 Andy McCall ↶ 1071 
        }
1072 
    }
1073 
    Ok(0)
1074 
}
1075
1076 
pub fn cat(path: &str, change: Option<&str>) -> Result<i32> {
1077 
    let repo = open()?;
1078 
    let heads = change.map(|c| repo.resolve_heads(c)).transpose()?;
b0a0c9af Andy McCall ↶ 1079 
    let bytes = match repo.file_at(path, heads.as_deref()) {
1080 
        Ok(b) => b,
1081 
        // -r CHANGE reads that change's dependency closure, not the
1082 
        // bookmark it is on: say so when the bookmark has the file
1083 
        // (oxygen#76).
1084 
        Err(e) => match change {
1085 
            Some(c)
1086 
                if !repo.view()?.bookmarks.contains_key(c)
1087 
                    && repo.tag_heads(c)?.is_none()
1088 
                    && repo.file_at(path, None).is_ok() =>
1089 
            {
1090 
                anyhow::bail!(
1091 
                    "{path} is not in {c}'s dependency closure (the change and what it \
1092 
                     depends on); it is on the bookmark: try -r {}, or --at-op OP for the \
1093 
                     state at an operation",
1094 
                    repo.config.bookmark
1095 
                )
1096 
            }
1097 
            _ => return Err(e.into()),
1098 
        },
1099 
    };
c6aa5bd9 Andy McCall ↶ 1100 
    use std::io::Write as _;
1101 
    std::io::stdout().write_all(&bytes)?;
1102 
    Ok(0)
1103 
}
1104
1105 
pub fn root(as_json: bool) -> Result<i32> {
1106 
    let Ok(repo) = Repo::open(&std::env::current_dir()?) else {
1107 
        if as_json {
1108 
            println!("null");
1109 
        }
1110 
        return Ok(1);
1111 
    };
1112 
    if as_json {
75167672 Andy McCall 1113 
        println!(
1114 
            "{}",
1115 
            json::obj([
1116 
                ("root", json::s(&repo.root().to_string_lossy())),
1117 
                ("workspace", json::s(&repo.workspace().to_hex())),
1118 
                ("bookmark", json::s(&repo.config.bookmark))
1119 
            ])
1120 
        );
c6aa5bd9 Andy McCall ↶ 1121 
    } else {
1122 
        println!("{}", repo.root().display());
1123 
    }
1124 
    Ok(0)
1125 
}
1126
1127 
pub fn version(as_json: bool) -> Result<i32> {
1128 
    if as_json {
75167672 Andy McCall 1129 
        println!(
1130 
            "{}",
1131 
            json::obj([
1132 
                ("version", json::s(env!("CARGO_PKG_VERSION"))),
e293c90d Andy McCall ↶ 1133 
                // What was built: a release's or install's `oxy describe`,
1134 
                // a Flow build's heads, or "local build".
1135 
                ("build", json::s(env!("OXY_BUILD_ID"))),
75167672 Andy McCall 1136 
                ("protocol", json::n(oxy_core::protocol::PROTOCOL_VERSION)),
1137 
                ("format", json::n(2))
1138 
            ])
1139 
        );
c6aa5bd9 Andy McCall ↶ 1140 
    } else {
75167672 Andy McCall 1141 
        println!(
1142 
            "oxy {} (repository format 2, protocol {})",
e293c90d Andy McCall ↶ 1143 
            env!("OXY_VERSION_LONG"),
75167672 Andy McCall 1144 
            oxy_core::protocol::PROTOCOL_VERSION
1145 
        );
c6aa5bd9 Andy McCall ↶ 1146 
    }
1147 
    Ok(0)
1148 
}
1149
1150 
pub fn discard(paths: &[String], hunks: &[usize]) -> Result<i32> {
1151 
    let repo = open()?;
1152 
    if paths.is_empty() && hunks.is_empty() {
1153 
        anyhow::bail!("name paths to restore, or --hunks to undo chosen hunks");
1154 
    }
1155 
    let mut n = 0;
1156 
    if !hunks.is_empty() {
1157 
        n += repo.discard_hunks(hunks)?;
1158 
    }
1159 
    if !paths.is_empty() {
1160 
        n += repo.discard(paths)?;
1161 
    }
75167672 Andy McCall 1162 
    println!(
1163 
        "{} {} restored to the working copy's base",
1164 
        ui::done("Discarded"),
1165 
        plural(n, "path")
1166 
    );
c6aa5bd9 Andy McCall ↶ 1167 
    Ok(0)
1168 
}
1169
1170 
pub fn hunks(as_json: bool) -> Result<i32> {
fce44ae9 Andy McCall ↶ 1171 
    let repo = open()?;
c6aa5bd9 Andy McCall ↶ 1172 
    let (_, hunks) = repo.hunks()?;
1173 
    if as_json {
75167672 Andy McCall 1174 
        println!(
1175 
            "{}",
1176 
            json::arr(hunks.iter().map(|h| json::obj([
1177 
                ("index", json::n(h.index)),
1178 
                ("path", json::s(&h.path)),
1179 
                ("text", json::s(&h.text))
1180 
            ])))
1181 
        );
c6aa5bd9 Andy McCall ↶ 1182 
        return Ok(0);
1183 
    }
1184 
    if hunks.is_empty() {
75167672 Andy McCall 1185 
        println!(
1186 
            "{}",
1187 
            ui::dim("No hunks: the working copy matches its base.")
1188 
        );
c6aa5bd9 Andy McCall ↶ 1189 
    }
1190 
    for h in &hunks {
75167672 Andy McCall 1191 
        println!(
1192 
            "{} {}",
1193 
            ui::section(format!("hunk {}", h.index)),
1194 
            ui::path(&h.path)
1195 
        );
c6aa5bd9 Andy McCall ↶ 1196 
        for line in h.text.lines() {
75167672 Andy McCall 1197 
            let styled = if line.starts_with('+') {
1198 
                ui::ok(line)
1199 
            } else if line.starts_with('-') {
1200 
                ui::err(line)
1201 
            } else {
1202 
                ui::dim(line)
1203 
            };
c6aa5bd9 Andy McCall ↶ 1204 
            println!("  {styled}");
1205 
        }
1206 
    }
fce44ae9 Andy McCall ↶ 1207 
    Ok(0)
1208 
}
1209
2c9ddac3 Andy McCall ↶ 1210 
pub fn show(change: Option<&str>, revset: Option<&str>, as_json: bool) -> Result<i32> {
fce44ae9 Andy McCall ↶ 1211 
    let repo = open()?;
cc7a0056 Andy McCall ↶ 1212 
    repo.snapshot_status("oxy show")?;
2c9ddac3 Andy McCall ↶ 1213 
    let Some(r) = revset else {
1214 
        let h = repo.resolve_change(change.unwrap_or("@"))?;
1215 
        return show_one(&repo, h, as_json, false);
1216 
    };
1217 
    // Several changes: a JSON array, or the changes one after another.
1218 
    let hashes = repo.revset(r)?.hashes;
1219 
    if as_json {
1220 
        print!("[");
1221 
        for (i, h) in hashes.iter().enumerate() {
1222 
            if i > 0 {
1223 
                print!(",");
1224 
            }
1225 
            show_one(&repo, *h, true, true)?;
1226 
        }
1227 
        println!("]");
1228 
        return Ok(0);
1229 
    }
1230 
    if hashes.is_empty() {
1231 
        println!("{}", ui::dim(format!("No change matches {r:?}.")));
1232 
        return Ok(0);
1233 
    }
1234 
    for (i, h) in hashes.iter().enumerate() {
1235 
        if i > 0 {
1236 
            println!();
1237 
        }
1238 
        show_one(&repo, *h, false, false)?;
1239 
    }
1240 
    Ok(0)
1241 
}
1242
1243 
/// One change, as `oxy show` prints it; `inline` JSON goes without its
1244 
/// newline, for an array.
1245 
fn show_one(repo: &Repo, h: ChangeHash, as_json: bool, inline: bool) -> Result<i32> {
fce44ae9 Andy McCall ↶ 1246 
    let c = repo.store().get_change(&h)?;
c6aa5bd9 Andy McCall ↶ 1247 
    if as_json {
1248 
        let files = repo.diff_files(Some(&h))?;
1249 
        let heads = repo.bookmark_heads()?;
75167672 Andy McCall 1250 
        let entry = oxy_core::repo::LogEntry {
1251 
            hash: h,
1252 
            change: oxy_core::state::ChangeMeta::of(&c),
1253 
            is_working_copy: c.kind == oxy_core::objects::ChangeKind::WorkingCopy,
1254 
            is_head: heads.contains(&h),
1255 
        };
2c9ddac3 Andy McCall ↶ 1256 
        let mut body = log_entry_json(repo, &entry)?;
c6aa5bd9 Andy McCall ↶ 1257 
        body.pop();
75167672 Andy McCall 1258 
        body.push_str(&format!(
1259 
            ",{}:{}}}",
1260 
            json::s("files"),
1261 
            json::arr(files.iter().map(|f| json::obj([
1262 
                ("path", json::s(&f.path)),
1263 
                ("kind", json::s(&f.kind)),
1264 
                ("from", json::opt(f.from.as_deref(), json::s))
1265 
            ])))
1266 
        ));
2c9ddac3 Andy McCall ↶ 1267 
        if inline {
1268 
            print!("{body}");
1269 
        } else {
1270 
            println!("{body}");
1271 
        }
c6aa5bd9 Andy McCall ↶ 1272 
        return Ok(0);
1273 
    }
75167672 Andy McCall 1274 
    println!(
1275 
        "{} {} {}",
1276 
        ui::section("change"),
1277 
        ui::id(short_id(&c)),
1278 
        ui::hash(format!("#{h}"))
1279 
    );
94084087 Andy McCall ↶ 1280 
    println!("{}", ui::kv("kind", format!("{:?}", c.kind).to_lowercase()));
b35df36b Andy McCall ↶ 1281 
    // Fetched but not pulled (oxygen#56): say where it is.
1282 
    if let Some(at) = repo.remote_only_location(&h)? {
1283 
        println!(
1284 
            "{}",
1285 
            ui::kv(
1286 
                "only in",
1287 
                ui::warn(format!(
1288 
                    "{at}: fetched, not yet in a local bookmark (oxy pull)"
1289 
                ))
1290 
            )
1291 
        );
1292 
    }
5cde7882 Andy McCall ↶ 1293 
    let meta = oxy_core::state::ChangeMeta::of(&c);
1294 
    let status = repo.authenticate_change_known(&h, Some(&meta))?;
1295 
    println!("{}", ui::kv("author", ui::author(author_name(repo, &meta))));
1296 
    if let Some(agent) = via(repo, &status, &meta.author) {
1297 
        println!("{}", ui::kv("via", agent.line()));
1298 
    }
75167672 Andy McCall 1299 
    println!(
1300 
        "{}",
1301 
        ui::kv(
1302 
            "date",
1303 
            format!(
1304 
                "{} {}",
1305 
                when(c.hlc.wall_ms),
1306 
                ui::dim(format!("({})", ui::ago(c.hlc.wall_ms)))
1307 
            )
1308 
        )
1309 
    );
94084087 Andy McCall ↶ 1310 
    println!("{}", ui::kv("deps", ui::dim(deps_line(&c))));
2c9ddac3 Andy McCall ↶ 1311 
    println!("{}", ui::kv("sig", signature_line(repo, &h)?));
94084087 Andy McCall ↶ 1312 
    println!();
75167672 Andy McCall 1313 
    for line in (if c.message.is_empty() {
1314 
        "(no description)"
1315 
    } else {
1316 
        &c.message
1317 
    })
1318 
    .lines()
1319 
    {
94084087 Andy McCall ↶ 1320 
        println!("    {line}");
1321 
    }
1322 
    println!();
fce44ae9 Andy McCall ↶ 1323 
    print!("{}", repo.describe_change(&h)?);
1324 
    Ok(0)
1325 
}
1326
1c2bd9ab Andy McCall ↶ 1327 
pub fn checkout(changes: &[String], discard: bool, carry: bool) -> Result<i32> {
fce44ae9 Andy McCall ↶ 1328 
    let repo = open()?;
a46f3e4f Andy McCall ↶ 1329 
    // `oxy checkout BOOKMARK` is being on that bookmark, as `git checkout
1330 
    // BRANCH` is: checking its files out under another bookmark's name
1331 
    // made the next commit move the wrong bookmark (oxygen#60).
1332 
    if let [name] = changes {
1333 
        if *name != repo.config.bookmark && names_bookmark(&repo, name)? {
1334 
            drop(repo);
1335 
            return bookmark_switch(name, discard, carry);
1336 
        }
1337 
    }
fce44ae9 Andy McCall ↶ 1338 
    let heads = if changes.is_empty() {
1339 
        repo.bookmark_heads()?
1340 
    } else {
132b884b Andy McCall ↶ 1341 
        let mut heads = Vec::new();
1342 
        for c in changes {
1343 
            heads.extend(repo.resolve_heads(c)?);
1344 
        }
1345 
        heads
fce44ae9 Andy McCall ↶ 1346 
    };
75167672 Andy McCall 1347 
    let spec = if changes.is_empty() {
1348 
        repo.config.bookmark.clone()
1349 
    } else {
1350 
        changes.join(" ")
1351 
    };
135212de Andy McCall ↶ 1352 
    let sp = ui::spinner(&format!("Checking out {spec}…"));
1c2bd9ab Andy McCall ↶ 1353 
    let command = format!("oxy checkout {spec}");
1354 
    let (r, carried) = if carry {
1355 
        repo.checkout_carry(&heads, &spec, &command)?
1356 
    } else {
1357 
        (repo.checkout(&heads, discard, &command)?, vec![])
1358 
    };
75167672 Andy McCall 1359 
    sp.done(&format!(
1c2bd9ab Andy McCall ↶ 1360 
        "{} on {}: {} written, {} removed{}",
75167672 Andy McCall 1361 
        ui::done("Working copy"),
1362 
        ui::bookmark(&spec),
1363 
        plural(r.written, "file"),
1c2bd9ab Andy McCall ↶ 1364 
        r.removed,
1365 
        if carried.is_empty() {
1366 
            String::new()
1367 
        } else {
1368 
            format!("; carried {}", plural(carried.len(), "changed path"))
1369 
        }
75167672 Andy McCall 1370 
    ));
9b723f69 Andy McCall ↶ 1371 
    print_removed(&r);
4dee277c Andy McCall ↶ 1372 
    for n in &r.notes {
1373 
        println!("  {} {n}", ui::note());
1374 
    }
fce44ae9 Andy McCall ↶ 1375 
    if r.conflicted {
75167672 Andy McCall 1376 
        println!(
1377 
            "  {} {}",
1378 
            ui::caution(),
1379 
            ui::warn("this state has conflicts; see oxy status")
1380 
        );
fce44ae9 Andy McCall ↶ 1381 
    }
98a1620a Andy McCall ↶ 1382 
    where_now(&repo);
fce44ae9 Andy McCall ↶ 1383 
    Ok(0)
1384 
}
1385
c6aa5bd9 Andy McCall ↶ 1386 
pub fn resolve(as_json: bool) -> Result<i32> {
fce44ae9 Andy McCall ↶ 1387 
    let repo = open()?;
1388 
    let snap = repo.snapshot("oxy resolve")?;
c6aa5bd9 Andy McCall ↶ 1389 
    if as_json {
1390 
        println!("{}", repo.status_json(&snap)?);
75167672 Andy McCall 1391 
        return Ok(if snap.base_snapshot.is_conflicted() {
1392 
            2
1393 
        } else {
1394 
            0
1395 
        });
c6aa5bd9 Andy McCall ↶ 1396 
    }
fce44ae9 Andy McCall ↶ 1397 
    if !snap.base_snapshot.is_conflicted() {
1398 
        println!("The working copy's base has no conflicts.");
1399 
        return Ok(0);
1400 
    }
1401 
    let mut remaining = 0;
1402 
    for (p, f) in &snap.base_snapshot.files {
1403 
        if !f.is_conflicted() {
1404 
            continue;
1405 
        }
75167672 Andy McCall 1406 
        match snap
1407 
            .statuses
1408 
            .iter()
1409 
            .find(|s| s.path == *p)
1410 
            .map(|s| s.status)
1411 
        {
fce44ae9 Andy McCall ↶ 1412 
            Some(ChangeStatus::Resolved) => println!("resolved   {p}"),
1413 
            Some(ChangeStatus::ConflictEdited) => {
1414 
                remaining += 1;
1415 
                println!("markers    {p}");
1416 
            }
1417 
            _ => {
1418 
                remaining += 1;
1419 
                println!("unresolved {p}");
1420 
            }
1421 
        }
1422 
    }
1423 
    for c in &snap.base_snapshot.tree.conflicts {
1424 
        remaining += 1;
1425 
        println!("tree       {c:?}");
1426 
    }
1427 
    if remaining == 0 {
1428 
        println!("All conflicts are resolved; `oxy commit` will record the resolution.");
1429 
        Ok(0)
1430 
    } else {
1431 
        Ok(2)
1432 
    }
1433 
}
1434
1435 
pub fn undo() -> Result<i32> {
1436 
    let repo = open()?;
530a0fc6 Andy McCall ↶ 1437 
    let u = repo.undo()?;
1438 
    println!("{} {}", ui::done("Undone:"), u.command);
1439 
    for c in &u.changes {
1440 
        println!("  {} {}", ui::note(), change_words(&repo, c));
1441 
    }
1442 
    if u.others_kept > 0 {
1443 
        let s = if u.others_kept == 1 { "" } else { "s" };
1444 
        println!(
1445 
            "  {} {}",
1446 
            ui::note(),
1447 
            ui::dim(format!(
1448 
                "{} newer operation{s} from other workspaces left as they are",
1449 
                u.others_kept
1450 
            ))
1451 
        );
1452 
    }
1453 
    for (bookmark, remote) in &u.pushed {
1454 
        println!(
1455 
            "  {} {}",
1456 
            ui::caution(),
1457 
            ui::warn(format!(
1458 
                "{remote}/{bookmark} already has what this undid: undone here only; the next push of {bookmark} needs --force to take it back there"
1459 
            ))
1460 
        );
1461 
    }
98a1620a Andy McCall ↶ 1462 
    where_now(&repo);
fce44ae9 Andy McCall ↶ 1463 
    Ok(0)
1464 
}
1465
98a1620a Andy McCall ↶ 1466 
pub fn op_log(limit: Option<usize>, as_json: bool) -> Result<i32> {
fce44ae9 Andy McCall ↶ 1467 
    let repo = open()?;
98a1620a Andy McCall ↶ 1468 
    let ops = repo.op_log()?;
1469 
    // What each operation changed, against the one before it.
1470 
    let changes_of = |i: usize| -> Result<Vec<oxy_core::repo::ViewChange>> {
1471 
        match ops.get(i + 1) {
1472 
            Some((_, before)) => Ok(repo.view_changes(&before.view, &ops[i].1.view)?),
1473 
            None => Ok(vec![]),
1474 
        }
1475 
    };
c6aa5bd9 Andy McCall ↶ 1476 
    if as_json {
98a1620a Andy McCall ↶ 1477 
        let mut items = Vec::new();
1478 
        for (i, (r, op)) in ops.iter().enumerate().take(limit.unwrap_or(usize::MAX)) {
1479 
            let summary: Vec<String> = changes_of(i)?
1480 
                .iter()
1481 
                .map(|c| change_words(&repo, c))
1482 
                .collect();
1483 
            items.push(json::obj([
1484 
                ("id", json::s(&r.to_hex())),
1485 
                ("when_ms", json::n(op.hlc.wall_ms)),
1486 
                ("command", json::s(&op.command)),
1487 
                ("snapshot", json::b(op.is_snapshot())),
1488 
                ("current", json::b(i == 0)),
1489 
                ("changes", json::arr(summary.iter().map(|x| json::s(x)))),
1490 
            ]));
1491 
        }
1492 
        println!("{}", json::arr(items));
c6aa5bd9 Andy McCall ↶ 1493 
        return Ok(0);
1494 
    }
98a1620a Andy McCall ↶ 1495 
    let id_prefix = unique_prefixes(ops.iter().map(|(r, _)| r.to_hex()));
1496 
    let id = |r: &oxy_core::hash::ObjectRef| {
1497 
        let hex = r.to_hex();
1498 
        let n = id_prefix.get(&hex).copied().unwrap_or(12).min(12);
1499 
        format!("{}{}", ui::id(&hex[..n]), ui::dim(&hex[n..12]))
1500 
    };
1501 
    let rail = ui::dim(ui::glyph("│", "|"));
1502 
    let (mut i, mut shown) = (0, 0);
1503 
    while i < ops.len() && shown < limit.unwrap_or(usize::MAX) {
1504 
        let (r, op) = &ops[i];
75167672 Andy McCall 1505 
        let bullet = if i == 0 {
98a1620a Andy McCall ↶ 1506 
            ui::ok(ui::glyph("@", "@"))
75167672 Andy McCall 1507 
        } else {
1508 
            ui::dim(ui::glyph("○", "o"))
1509 
        };
98a1620a Andy McCall ↶ 1510 
        // A run of snapshots folds into one entry.
1511 
        let mut run = 1;
1512 
        while op.is_snapshot() && i + run < ops.len() && ops[i + run].1.is_snapshot() {
1513 
            run += 1;
1514 
        }
1515 
        let when = ui::dim(ui::ago(op.hlc.wall_ms));
1516 
        if op.is_snapshot() {
1517 
            let span = if run > 1 {
1518 
                format!("{} {}", ui::dim("…"), id(&ops[i + run - 1].0))
1519 
            } else {
1520 
                String::new()
1521 
            };
1522 
            println!(
1523 
                "{bullet}  {}{} {when}",
1524 
                id(r),
1525 
                if span.is_empty() {
1526 
                    String::new()
1527 
                } else {
1528 
                    format!(" {span}")
1529 
                }
1530 
            );
1531 
            println!(
1532 
                "{rail}  {}",
1533 
                ui::dim(if run == 1 {
1534 
                    "working-copy snapshot".to_string()
1535 
                } else {
1536 
                    format!("{run} working-copy snapshots")
1537 
                })
1538 
            );
1539 
        } else {
1540 
            println!("{bullet}  {} {when}", id(r));
1541 
            let words: Vec<String> = changes_of(i)?
1542 
                .iter()
1543 
                .map(|c| change_words(&repo, c))
1544 
                .collect();
1545 
            let summary = if words.is_empty() {
1546 
                if i + 1 == ops.len() {
1547 
                    "created the repository".to_string()
1548 
                } else {
1549 
                    "no bookmark or working-copy change".to_string()
1550 
                }
1551 
            } else {
1552 
                words.join("; ")
1553 
            };
1554 
            println!(
1555 
                "{rail}  {}",
1556 
                if i == 0 {
1557 
                    ui::subject(&summary)
1558 
                } else {
1559 
                    summary
1560 
                }
1561 
            );
1562 
            let cmd = op.command.lines().next().unwrap_or("");
1563 
            let cmd: String = cmd.chars().take(100).collect();
1564 
            println!("{rail}  {}", ui::dim(cmd));
1565 
        }
1566 
        i += run;
1567 
        shown += 1;
1568 
    }
1569 
    if i < ops.len() {
75167672 Andy McCall 1570 
        println!(
98a1620a Andy McCall ↶ 1571 
            "{}",
1572 
            ui::dim(format!(
1573 
                "{} {} older; pass -n to see more",
1574 
                ui::glyph("…", "..."),
1575 
                plural(ops.len() - i, "operation")
1576 
            ))
1577 
        );
1578 
    }
1579 
    Ok(0)
1580 
}
1581
1582 
/// One change an operation made, in words.
1583 
fn change_words(repo: &Repo, c: &oxy_core::repo::ViewChange) -> String {
1584 
    use oxy_core::repo::ViewChange::*;
1585 
    match c {
1586 
        BookmarkCreated { name, heads } => {
1587 
            format!("created bookmark {name} ({})", plural(*heads, "head"))
1588 
        }
1589 
        BookmarkDeleted { name } => format!("deleted bookmark {name}"),
1590 
        BookmarkMoved { name, from, to } if from == to => format!("moved {name}"),
1591 
        BookmarkMoved { name, from, to } => format!(
1592 
            "{name}: {from} {} {}",
1593 
            ui::glyph("→", "->"),
1594 
            plural(*to, "head")
1595 
        ),
1596 
        RemoteMoved { remote, name } => format!("{remote}/{name} updated"),
1597 
        TagCreated { name } => format!("tagged {name}"),
1598 
        TagDeleted { name } => format!("removed tag {name}"),
1599 
        Policy => "trust policy changed".to_string(),
1600 
        WorkingCopy { change } => match repo.store().get_change_meta(change) {
1601 
            Ok(m) => format!("working copy now {}", m.change_id.short(8)),
1602 
            Err(_) => "working copy moved".to_string(),
1603 
        },
1604 
    }
1605 
}
1606
1607 
pub fn op_restore(op: &str, discard: bool) -> Result<i32> {
1608 
    let repo = open()?;
1609 
    let sp = ui::spinner(&format!("Restoring to operation {op}…"));
1610 
    let r = repo.op_restore(op, discard)?;
1611 
    sp.done(&format!(
1612 
        "{} to operation {} {}",
1613 
        ui::done("Restored"),
1614 
        ui::hash(r.op.short(12)),
1615 
        ui::dim(r.command.lines().next().unwrap_or(""))
1616 
    ));
1617 
    println!(
1618 
        "  {} {}",
1619 
        ui::note(),
1620 
        ui::dim(format!(
1621 
            "{} written, {} removed; oxy undo goes back again",
1622 
            plural(r.checkout.written, "file"),
1623 
            r.checkout.removed
1624 
        ))
1625 
    );
1626 
    where_now(&repo);
1627 
    Ok(0)
1628 
}
1629
1630 
pub fn op_revert(op: &str) -> Result<i32> {
1631 
    let repo = open()?;
1632 
    let r = repo.op_revert(op)?;
1633 
    let view = repo.view()?;
1634 
    let names: Vec<String> = r
1635 
        .reverted
1636 
        .iter()
1637 
        .map(|n| {
1638 
            if view.bookmarks.contains_key(n) {
1639 
                ui::bookmark(n)
75167672 Andy McCall 1640 
            } else {
98a1620a Andy McCall ↶ 1641 
                format!("{} (removed)", ui::bookmark(n))
75167672 Andy McCall 1642 
            }
98a1620a Andy McCall ↶ 1643 
        })
1644 
        .collect();
1645 
    println!(
1646 
        "{} operation {} {}",
1647 
        ui::done("Reverted"),
1648 
        ui::hash(r.op.short(12)),
1649 
        ui::dim(r.command.lines().next().unwrap_or(""))
1650 
    );
1651 
    println!(
1652 
        "  {} {}",
1653 
        ui::note(),
1654 
        ui::dim(format!("as before it: {}", names.join(", ")))
1655 
    );
1656 
    if !r.kept.is_empty() {
1657 
        println!(
1658 
            "  {} {}",
1659 
            ui::caution(),
1660 
            ui::warn(format!(
1661 
                "left as they are, having moved again since: {}",
1662 
                r.kept.join(", ")
1663 
            ))
75167672 Andy McCall 1664 
        );
fce44ae9 Andy McCall ↶ 1665 
    }
98a1620a Andy McCall ↶ 1666 
    if !r.checked_out && r.reverted.contains(&repo.config.bookmark) {
1667 
        println!(
1668 
            "  {} {}",
1669 
            ui::note(),
1670 
            ui::dim("the working copy has work of its own: oxy checkout to move it")
1671 
        );
1672 
    }
1673 
    where_now(&repo);
fce44ae9 Andy McCall ↶ 1674 
    Ok(0)
98a1620a Andy McCall ↶ 1675 
}
1676
1677 
/// Where the working copy and bookmark are now, after a command moved
1678 
/// them (as jj says "Working copy now at").
1679 
pub fn where_now(repo: &Repo) {
1680 
    let Ok((_, wc)) = repo.working_copy() else {
1681 
        return;
1682 
    };
1683 
    let heads = repo.bookmark_heads().unwrap_or_default();
1684 
    let newest = heads
1685 
        .iter()
1686 
        .filter_map(|h| repo.store().get_change_meta(h).ok().map(|m| (m, *h)))
1687 
        .max_by_key(|(m, _)| m.hlc);
1688 
    println!(
1689 
        "  {} {}",
1690 
        ui::dim(format!("{:<13}", "Working copy")),
1691 
        ui::id(wc.change_id.short(8))
1692 
    );
1693 
    let tail = match newest {
1694 
        Some((m, _)) => format!(
1695 
            ", newest {} {}",
1696 
            ui::id(m.change_id.short(8)),
1697 
            subject_of(&m.message)
1698 
        ),
1699 
        None => String::new(),
1700 
    };
1701 
    println!(
1702 
        "  {} {}: {}{tail}",
1703 
        ui::dim(format!("{:<13}", "Bookmark")),
1704 
        ui::bookmark(&repo.config.bookmark),
1705 
        plural(heads.len(), "head")
1706 
    );
fce44ae9 Andy McCall ↶ 1707 
}
d02e545d Andy McCall ↶ 1708
b689779e Andy McCall ↶ 1709 
pub fn gc(now: bool, expire_snapshots: bool) -> Result<i32> {
1710 
    let mut repo = open()?;
1711 
    if expire_snapshots {
1712 
        repo.config.snapshot_retention_days = 0;
1713 
    }
135212de Andy McCall ↶ 1714 
    let sp = ui::spinner("Packing and pruning…");
9ae4d15a Andy McCall ↶ 1715 
    let r = repo.gc_with(now, &mut |phase| sp.set(&format!("{phase}…")))?;
135212de Andy McCall ↶ 1716 
    sp.clear();
ba160f60 Andy McCall ↶ 1717 
    if r.packed.objects > 0 {
d02e545d Andy McCall ↶ 1718 
        println!(
da652d63 Andy McCall ↶ 1719 
            "Packed {} into one pack: {} bytes -> {} bytes ({:.0}%).",
1720 
            plural(r.packed.objects, "object"),
ba160f60 Andy McCall ↶ 1721 
            r.packed.raw_bytes,
1722 
            r.packed.packed_bytes,
1723 
            100.0 * r.packed.packed_bytes as f64 / r.packed.raw_bytes.max(1) as f64
d02e545d Andy McCall ↶ 1724 
        );
1725 
    }
75167672 Andy McCall 1726 
    println!(
1727 
        "{} reachable; pruned {} ({} bytes){}{}; {} present.",
ba160f60 Andy McCall ↶ 1728 
        plural(r.reachable, "object"),
1729 
        plural(r.pruned.objects, "unreachable object"),
1730 
        r.pruned.bytes,
75167672 Andy McCall 1731 
        if r.pruned.deferred > 0 {
1732 
            format!(
1733 
                "; {} deferred by the grace period (use --now)",
1734 
                plural(r.pruned.deferred, "object")
1735 
            )
1736 
        } else {
1737 
            String::new()
1738 
        },
1739 
        if r.merged_packs > 0 {
1740 
            format!("; merged {} into one", plural(r.merged_packs, "pack"))
1741 
        } else {
1742 
            String::new()
1743 
        },
ba160f60 Andy McCall ↶ 1744 
        plural(repo.store().pack_count(), "pack")
1745 
    );
767ac6cd Andy McCall 1746 
    // What earlier repacks replaced stays an hour for readers still using
1747 
    // it (oxygenhub#249); a collection after that deletes it.
1748 
    let kept = if r.retired.kept > 0 {
1749 
        format!(
1750 
            "{} retired less than an hour ago kept for readers",
1751 
            plural(r.retired.kept, "file")
1752 
        )
1753 
    } else {
1754 
        String::new()
1755 
    };
1756 
    if r.retired.packs + r.retired.loose > 0 {
1757 
        println!(
1758 
            "Deleted {} and {} retired by earlier repacks{}.",
1759 
            plural(r.retired.packs, "pack"),
1760 
            plural(r.retired.loose, "loose object"),
1761 
            if kept.is_empty() {
1762 
                String::new()
1763 
            } else {
1764 
                format!("; {kept}")
1765 
            }
1766 
        );
1767 
    } else if !kept.is_empty() {
1768 
        println!("{kept}.");
1769 
    }
d02e545d Andy McCall ↶ 1770 
    Ok(0)
1771 
}
614541c3 Andy McCall ↶ 1772
d8d93678 Andy McCall ↶ 1773 
/// `oxy gc --remote NAME`: fold a store remote's bundles into one.
1774 
pub fn gc_remote(name: &str, now: bool) -> Result<i32> {
1775 
    let repo = open()?;
1776 
    let sp = ui::spinner(&format!("Folding {name}'s bundles…"));
1777 
    let r = repo.gc_remote(name, now)?;
1778 
    sp.clear();
1779 
    if r.merged > 0 {
1780 
        println!(
1781 
            "{} {} into one of {} bytes ({})",
1782 
            ui::done("Folded"),
1783 
            plural(r.merged, "bundle"),
1784 
            r.bundle_bytes,
1785 
            plural(r.changes, "change")
1786 
        );
1787 
    } else {
1788 
        println!(
1789 
            "{} {}",
1790 
            ui::note(),
1791 
            ui::dim("nothing to fold: one bundle holds everything")
1792 
        );
1793 
    }
1794 
    println!(
1795 
        "  {} {}",
1796 
        ui::note(),
1797 
        ui::dim(format!(
1798 
            "removed {}{}",
1799 
            plural(r.deleted, "superseded bundle"),
1800 
            if r.deferred > 0 {
1801 
                format!(
1802 
                    "; {} kept for readers that may still fetch them (use --now)",
1803 
                    plural(r.deferred, "bundle")
1804 
                )
1805 
            } else {
1806 
                String::new()
1807 
            }
1808 
        ))
1809 
    );
1810 
    Ok(0)
1811 
}
1812
3e5772cc Andy McCall ↶ 1813 
/// `oxy doctor`: exit 1 when a check fails, 0 otherwise (warnings allowed).
1814 
pub fn doctor(offline: bool, as_json: bool) -> Result<i32> {
1815 
    use oxy_core::repo::Health;
1816 
    let repo = open()?;
1817 
    let sp = ui::spinner(if offline {
1818 
        "Checking…"
1819 
    } else {
1820 
        "Checking, and contacting remotes…"
1821 
    });
1822 
    let r = repo.doctor(!offline);
1823 
    sp.clear();
1824 
    let code = if r.worst() == Health::Fail { 1 } else { 0 };
1825 
    let word = |h: Health| match h {
1826 
        Health::Ok => "ok",
1827 
        Health::Warn => "warning",
1828 
        Health::Fail => "fail",
1829 
    };
1830 
    if as_json {
1831 
        let checks: Vec<String> = r
1832 
            .checks
1833 
            .iter()
1834 
            .map(|c| {
1835 
                json::obj([
1836 
                    ("area", json::s(&c.area)),
1837 
                    ("health", json::s(word(c.health))),
1838 
                    ("message", json::s(&c.message)),
1839 
                    ("hint", json::opt(c.hint.as_deref(), json::s)),
1840 
                ])
1841 
            })
1842 
            .collect();
1843 
        println!(
1844 
            "{}",
1845 
            json::obj([("ok", json::b(code == 0)), ("checks", json::arr(checks))])
1846 
        );
1847 
        return Ok(code);
1848 
    }
1849 
    let mut last = "";
1850 
    for c in &r.checks {
1851 
        if c.area != last {
1852 
            println!("{}", ui::section(&c.area));
1853 
            last = &c.area;
1854 
        }
1855 
        let mark = match c.health {
1856 
            Health::Ok => ui::ok(ui::glyph("✔", "v")),
1857 
            Health::Warn => ui::caution(),
1858 
            Health::Fail => ui::err(ui::glyph("✖", "x")),
1859 
        };
1860 
        println!("  {mark} {}", c.message);
1861 
        if let Some(h) = &c.hint {
1862 
            println!("    {} {}", ui::dim("→"), ui::dim(h));
1863 
        }
1864 
    }
1865 
    let fails = r.checks.iter().filter(|c| c.health == Health::Fail).count();
1866 
    let warns = r.checks.iter().filter(|c| c.health == Health::Warn).count();
1867 
    if fails + warns == 0 {
1868 
        println!("{}", ui::done("Everything looks right."));
1869 
    } else {
1870 
        println!(
1871 
            "{} {}, {}.",
1872 
            if fails > 0 {
1873 
                ui::err(ui::glyph("✖", "x"))
1874 
            } else {
1875 
                ui::caution()
1876 
            },
1877 
            plural(fails, "problem"),
1878 
            plural(warns, "warning")
1879 
        );
1880 
    }
1881 
    Ok(code)
1882 
}
1883
387335ff Andy McCall ↶ 1884 
/// `oxy fsck`: exit 0 when sound (warnings allowed), 1 on any error.
1885 
pub fn fsck(as_json: bool) -> Result<i32> {
1886 
    use oxy_core::repo::Severity;
1887 
    let repo = open()?;
1888 
    let sp = ui::spinner("Checking every object…");
1889 
    let r = repo.fsck()?;
1890 
    sp.clear();
1891 
    let code = if r.errors() > 0 { 1 } else { 0 };
1892 
    if as_json {
1893 
        let problems: Vec<String> = r
1894 
            .problems
1895 
            .iter()
1896 
            .map(|p| {
1897 
                json::obj([
1898 
                    (
1899 
                        "severity",
1900 
                        json::s(match p.severity {
1901 
                            Severity::Error => "error",
1902 
                            Severity::Warning => "warning",
1903 
                        }),
1904 
                    ),
1905 
                    (
1906 
                        "object",
1907 
                        json::opt(p.object.map(|o| o.to_hex()).as_deref(), json::s),
1908 
                    ),
1909 
                    ("what", json::s(&p.what)),
1910 
                ])
1911 
            })
1912 
            .collect();
1913 
        println!(
1914 
            "{}",
1915 
            json::obj([
1916 
                ("ok", json::b(code == 0)),
1917 
                ("objects", json::n(r.objects)),
1918 
                ("ops", json::n(r.ops)),
1919 
                ("changes", json::n(r.changes)),
1920 
                ("signed", json::n(r.signed)),
1921 
                ("unsigned", json::n(r.unsigned)),
1922 
                ("checkpoints", json::n(r.checkpoints)),
1923 
                ("attestations", json::n(r.attestations)),
1924 
                ("errors", json::n(r.errors())),
1925 
                ("warnings", json::n(r.warnings())),
1926 
                ("problems", json::arr(problems)),
1927 
            ])
1928 
        );
1929 
        return Ok(code);
1930 
    }
1931 
    println!(
1932 
        "Checked {}, {}, {} ({} signed or sealed, {} unsigned), {}, {}.",
1933 
        plural(r.objects, "object"),
1934 
        plural(r.ops, "operation"),
1935 
        plural(r.changes, "change"),
1936 
        r.signed,
1937 
        r.unsigned,
1938 
        plural(r.checkpoints, "checkpoint"),
1939 
        plural(r.attestations, "attestation"),
1940 
    );
1941 
    for p in &r.problems {
1942 
        let obj = p
1943 
            .object
1944 
            .map(|o| format!("{} ", ui::hash(format!("#{}", o.short(12)))))
1945 
            .unwrap_or_default();
1946 
        match p.severity {
1947 
            Severity::Error => println!("{} {obj}{}", ui::err(ui::glyph("✖", "x")), p.what),
1948 
            Severity::Warning => println!("{} {obj}{}", ui::caution(), p.what),
1949 
        }
1950 
    }
1951 
    if r.problems.is_empty() {
1952 
        println!("{}", ui::done("No problems found."));
1953 
    } else if code == 0 {
1954 
        println!(
1955 
            "{}",
1956 
            ui::done(format!("Sound, with {}.", plural(r.warnings(), "warning")))
1957 
        );
1958 
    } else {
1959 
        println!(
1960 
            "{} {} and {}. Fetch missing objects from a remote with `oxy pull`, or clone afresh and compare.",
1961 
            ui::err(ui::glyph("✖", "x")),
1962 
            plural(r.errors(), "error"),
1963 
            plural(r.warnings(), "warning")
1964 
        );
1965 
    }
1966 
    Ok(code)
1967 
}
1968
79d03f82 Andy McCall ↶ 1969 
/// The head the working copy sits on, for commands that default to it. With
1970 
/// several heads beneath the working copy, the most recently made one is
1971 
/// chosen and announced.
614541c3 Andy McCall ↶ 1972 
fn current_head(repo: &Repo) -> Result<oxy_core::hash::ChangeHash> {
cc7a0056 Andy McCall ↶ 1973 
    let snap = repo.snapshot_status("oxy")?;
614541c3 Andy McCall ↶ 1974 
    let base = snap.base.maximal(&snap.wc.deps);
1975 
    match base.as_slice() {
79d03f82 Andy McCall ↶ 1976 
        [] => anyhow::bail!("the working copy sits on no change yet"),
614541c3 Andy McCall ↶ 1977 
        [h] => Ok(*h),
79d03f82 Andy McCall ↶ 1978 
        many => {
1979 
            let latest = many
1980 
                .iter()
1981 
                .max_by_key(|h| snap.base.get(h).map(|c| (c.hlc, **h)))
1982 
                .copied()
1983 
                .unwrap();
1984 
            let c = repo.store().get_change(&latest)?;
75167672 Andy McCall 1985 
            println!(
1986 
                "Defaulting to {} #{} (most recent of the {} heads under the working copy)",
1987 
                short_id(&c),
1988 
                latest.short(12),
1989 
                many.len()
1990 
            );
79d03f82 Andy McCall ↶ 1991 
            Ok(latest)
1992 
        }
614541c3 Andy McCall ↶ 1993 
    }
1994 
}
1995
6a81dbab Andy McCall ↶ 1996 
/// `oxy describe` without -m: the working copy's name for a build.
1997 
pub fn describe_name(as_json: bool) -> Result<i32> {
1998 
    let repo = open()?;
1999 
    let d = repo.describe_working_copy()?;
2000 
    if as_json {
2001 
        println!(
2002 
            "{}",
2003 
            json::obj([
2004 
                ("describe", json::s(&d.line())),
2005 
                ("tag", json::opt(d.tag.as_ref(), |t| json::s(t))),
2006 
                ("distance", json::n(d.distance)),
2007 
                ("bookmark", json::s(&d.bookmark)),
2008 
                ("change", json::s(&d.change.to_hex())),
2009 
                ("hash", json::s(&d.hash.to_hex())),
2010 
                ("dirty", json::b(d.dirty)),
2011 
            ])
2012 
        );
2013 
    } else {
2014 
        println!("{}", d.line());
2015 
    }
2016 
    Ok(0)
2017 
}
2018
614541c3 Andy McCall ↶ 2019 
pub fn describe(message: &str, change: Option<&str>) -> Result<i32> {
2020 
    let repo = open()?;
2021 
    let h = match change {
2022 
        Some(c) => repo.resolve_change(c)?,
2023 
        None => current_head(&repo)?,
2024 
    };
2025 
    let new = repo.describe(&h, message)?;
631fc897 Andy McCall ↶ 2026 
    let c = repo.store().get_change_meta(&new)?;
75167672 Andy McCall 2027 
    println!(
2028 
        "{} {} {}  {}",
2029 
        ui::done("Described"),
631fc897 Andy McCall ↶ 2030 
        ui::id(c.change_id.short(8)),
75167672 Andy McCall 2031 
        ui::hash(format!("#{}", new.short(12))),
2032 
        ui::subject(subject_of(message))
2033 
    );
614541c3 Andy McCall ↶ 2034 
    Ok(0)
2035 
}
2036
23b217d7 Andy McCall ↶ 2037 
pub fn amend(message: Option<&str>, into: Option<&str>) -> Result<i32> {
614541c3 Andy McCall ↶ 2038 
    let repo = open()?;
530a0fc6 Andy McCall ↶ 2039 
    let before = repo.view()?;
23b217d7 Andy McCall ↶ 2040 
    let new = match into {
2041 
        Some(spec) => {
2042 
            let target = repo.resolve_change(spec)?;
2043 
            repo.amend_into(&target, message)?
2044 
        }
2045 
        None => repo.amend(message)?,
2046 
    };
631fc897 Andy McCall ↶ 2047 
    let c = repo.store().get_change_meta(&new)?;
75167672 Andy McCall 2048 
    println!(
2049 
        "{} {} {}  {}",
2050 
        ui::done("Amended"),
631fc897 Andy McCall ↶ 2051 
        ui::id(c.change_id.short(8)),
75167672 Andy McCall 2052 
        ui::hash(format!("#{}", new.short(12))),
2053 
        ui::subject(subject_of(&c.message))
2054 
    );
530a0fc6 Andy McCall ↶ 2055 
    // Rewriting what a remote already has means the next push replaces it
2056 
    // there (oxygen#99): say so now, not when the push is refused.
2057 
    let bookmark = repo.config.bookmark.clone();
2058 
    let (had, has) = (
2059 
        repo.heads_of(&before, &bookmark)?,
2060 
        repo.heads_of(&repo.view()?, &bookmark)?,
2061 
    );
2062 
    for (remote, bookmarks) in &before.remotes {
2063 
        let Some(st) = bookmarks.get(&bookmark) else {
2064 
            continue;
2065 
        };
2066 
        let theirs = repo.store().get_state(st)?.heads;
2067 
        if theirs.iter().any(|h| had.contains(h) && !has.contains(h)) {
2068 
            println!(
2069 
                "  {} {}",
2070 
                ui::caution(),
2071 
                ui::warn(format!(
2072 
                    "{remote}/{bookmark} has the change as it was: the next push of {bookmark} needs --force to replace it"
2073 
                ))
2074 
            );
2075 
        }
2076 
    }
98a1620a Andy McCall ↶ 2077 
    where_now(&repo);
614541c3 Andy McCall ↶ 2078 
    Ok(0)
2079 
}
2080
2c9ddac3 Andy McCall ↶ 2081 
pub fn abandon(change: Option<&str>, revset: Option<&str>, yes: bool) -> Result<i32> {
614541c3 Andy McCall ↶ 2082 
    let repo = open()?;
2c9ddac3 Andy McCall ↶ 2083 
    let Some(r) = revset else {
2084 
        let h = repo.resolve_change(change.unwrap_or_default())?;
2085 
        abandon_one(&repo, h)?;
2086 
        where_now(&repo);
2087 
        return Ok(0);
2088 
    };
2089 
    // A revset: say what it selects, refuse an empty set, ask above a few.
2090 
    let selected = repo.revset(r)?;
2091 
    let wc = repo.working_copy().ok().map(|(h, _)| h);
2092 
    let hashes: Vec<ChangeHash> = selected
2093 
        .hashes
2094 
        .iter()
2095 
        .copied()
2096 
        .filter(|h| Some(*h) != wc)
2097 
        .collect();
2098 
    if hashes.is_empty() {
2099 
        anyhow::bail!("{r:?} selects no change to abandon");
2100 
    }
2101 
    println!(
2102 
        "{} {} selects {}:",
2103 
        ui::section("abandon"),
2104 
        ui::id(r),
2105 
        plural(hashes.len(), "change")
2106 
    );
2107 
    for h in &hashes {
2108 
        if let Some(m) = selected.metas.get(h) {
2109 
            println!(
2110 
                "  {} {}  {}",
2111 
                ui::id(m.change_id.short(8)),
2112 
                ui::hash(format!("#{}", h.short(12))),
2113 
                subject_of(&m.message)
2114 
            );
2115 
        }
2116 
    }
2117 
    const ASK_ABOVE: usize = 5;
2118 
    if hashes.len() > ASK_ABOVE && !yes {
2119 
        anyhow::bail!("that is more than {ASK_ABOVE} changes; pass --yes to abandon them all");
2120 
    }
2121 
    // Newest first: abandoning a change rewrites what depends on it, so a
2122 
    // later member is found again by its ChangeId.
2123 
    let mut done = 0;
2124 
    for h in &hashes {
2125 
        let Some(m) = selected.metas.get(h) else {
2126 
            continue;
2127 
        };
2128 
        let now = match repo.resolve_change(&m.change_id.to_hex()) {
2129 
            Ok(h) => h,
2130 
            Err(_) => continue,
2131 
        };
2132 
        abandon_one(&repo, now)?;
2133 
        done += 1;
2134 
    }
2135 
    println!("{} {}", ui::done("Abandoned"), plural(done, "change"));
2136 
    where_now(&repo);
2137 
    Ok(0)
2138 
}
2139
2140 
fn abandon_one(repo: &Repo, h: ChangeHash) -> Result<()> {
631fc897 Andy McCall ↶ 2141 
    let c = repo.store().get_change_meta(&h)?;
6706bdcf Andy McCall ↶ 2142 
    let notes = repo.abandon(&h)?;
75167672 Andy McCall 2143 
    println!(
2144 
        "{} {} {}  {}",
2145 
        ui::done("Abandoned"),
631fc897 Andy McCall ↶ 2146 
        ui::id(c.change_id.short(8)),
75167672 Andy McCall 2147 
        ui::hash(format!("#{}", h.short(12))),
2148 
        ui::dim("its content remains on disk as uncommitted work if the working copy sat on it")
2149 
    );
6706bdcf Andy McCall ↶ 2150 
    for n in notes {
94084087 Andy McCall ↶ 2151 
        println!("  {} {n}", ui::note());
6706bdcf Andy McCall ↶ 2152 
    }
2c9ddac3 Andy McCall ↶ 2153 
    Ok(())
614541c3 Andy McCall ↶ 2154 
}
252e8cb2 Andy McCall ↶ 2155
2156 
pub fn checkpoint() -> Result<i32> {
2157 
    let repo = open()?;
135212de Andy McCall ↶ 2158 
    let sp = ui::spinner("Writing checkpoint…");
252e8cb2 Andy McCall ↶ 2159 
    let (r, changes, bytes) = repo.checkpoint()?;
75167672 Andy McCall 2160 
    sp.done(&format!(
2161 
        "{} {} of {} ({} bytes) for {}",
2162 
        ui::done("Checkpoint"),
2163 
        ui::hash(format!("#{}", r.short(12))),
2164 
        plural(changes, "change"),
2165 
        bytes,
2166 
        ui::id(&repo.config.bookmark)
2167 
    ));
135212de Andy McCall ↶ 2168 
    Ok(0)
2169 
}
2170
2171 
/// For shell prompts: silent (exit 1) outside a repository, otherwise one line.
694805cc Andy McCall ↶ 2172 
pub fn prompt(format: &str, glyphs: bool, color: Option<&str>) -> Result<i32> {
75167672 Andy McCall 2173 
    let Ok(repo) = Repo::open(&std::env::current_dir()?) else {
2174 
        return Ok(1);
2175 
    };
135212de Andy McCall ↶ 2176 
    let info = repo.quick_status()?;
75167672 Andy McCall 2177 
    let fmt = if glyphs && format == oxy_core::repo::DEFAULT_PROMPT_FORMAT {
2178 
        oxy_core::repo::GLYPH_PROMPT_FORMAT
2179 
    } else {
2180 
        format
2181 
    };
694805cc Andy McCall ↶ 2182 
    let line = match color {
2183 
        Some("bash") => info.format_colored(fmt, ("\\[", "\\]")),
2184 
        Some("zsh") => info.format_colored(fmt, ("%{", "%}")),
2185 
        Some(_) => info.format_colored(fmt, ("", "")),
2186 
        None => info.format(fmt),
2187 
    };
2188 
    println!("{line}");
252e8cb2 Andy McCall ↶ 2189 
    Ok(0)
2190 
}
7421309f Andy McCall ↶ 2191
2192 
pub fn sparse(paths: &[String]) -> Result<i32> {
2193 
    let mut repo = open()?;
2194 
    if paths.is_empty() {
2195 
        if repo.config.sparse_paths.is_empty() {
2196 
            println!("No sparse filter: the whole tree is materialized.");
2197 
        } else {
2198 
            println!("{}", ui::heading("Sparse filter"));
2199 
            for p in &repo.config.sparse_paths {
2200 
                println!("  {}", ui::path(p));
2201 
            }
2202 
        }
2203 
        return Ok(0);
2204 
    }
2205 
    let snap = repo.snapshot("oxy sparse")?;
2206 
    if !snap.wc.tree_ops.is_empty() || !snap.wc.edits.is_empty() {
75167672 Andy McCall 2207 
        anyhow::bail!(
2208 
            "the working copy has changes; commit them before changing the sparse filter"
2209 
        );
7421309f Andy McCall ↶ 2210 
    }
2211 
    repo.config.set("filter.paths", &paths.join(","))?;
2212 
    repo.save_config()?;
2213 
    let heads = repo.bookmark_heads()?;
2214 
    let sp = ui::spinner("Re-checking out with the new filter…");
2215 
    let r = repo.checkout(&heads, true, "oxy sparse (checkout)")?;
75167672 Andy McCall 2216 
    sp.done(&format!(
2217 
        "{} {}: {} written, {} removed",
c07406bc Andy McCall ↶ 2218 
        ui::done("Sparse filter set to"),
75167672 Andy McCall 2219 
        ui::path(paths.join(",")),
2220 
        plural(r.written, "file"),
2221 
        r.removed
2222 
    ));
7421309f Andy McCall ↶ 2223 
    Ok(0)
2224 
}
132b884b Andy McCall ↶ 2225
2226 
pub fn tag_create(name: &str, changes: &[String], message: &str) -> Result<i32> {
2227 
    let repo = open()?;
cc7a0056 Andy McCall ↶ 2228 
    repo.snapshot_status("oxy tag")?;
132b884b Andy McCall ↶ 2229 
    let heads = if changes.is_empty() {
2230 
        repo.bookmark_heads()?
2231 
    } else {
2232 
        let mut heads = Vec::new();
2233 
        for c in changes {
2234 
            heads.extend(repo.resolve_heads(c)?);
2235 
        }
2236 
        heads
2237 
    };
2238 
    let t = repo.tag_create(name, &heads, message)?;
2239 
    println!(
94084087 Andy McCall ↶ 2240 
        "{} {} {} {} ({}){}",
2241 
        ui::done("Tagged"),
2242 
        ui::bookmark(&t.name),
2243 
        ui::dim(ui::glyph("→", "->")),
132b884b Andy McCall ↶ 2244 
        ui::hash(format!("#{}", t.state.short(12))),
2245 
        plural(t.heads.len(), "head"),
75167672 Andy McCall 2246 
        t.signer
2247 
            .map(|s| format!(", signed by {s}"))
2248 
            .unwrap_or_else(|| ui::dim(", unsigned"))
132b884b Andy McCall ↶ 2249 
    );
2250 
    Ok(0)
2251 
}
2252
1196b29b Andy McCall ↶ 2253 
pub fn tag_list(as_json: bool) -> Result<i32> {
132b884b Andy McCall ↶ 2254 
    let repo = open()?;
2255 
    let tags = repo.tags()?;
1196b29b Andy McCall ↶ 2256 
    if as_json {
2257 
        println!(
2258 
            "{}",
2259 
            json::arr(tags.iter().map(|t| {
2260 
                json::obj([
2261 
                    ("name", json::s(&t.name)),
2262 
                    ("state", json::s(&t.state.to_hex())),
2263 
                    ("heads", json::hashes(&t.heads)),
2264 
                    ("message", json::s(&t.message)),
75167672 Andy McCall 2265 
                    (
2266 
                        "signer",
2267 
                        json::opt(t.signer.as_ref(), |s| json::s(&s.to_string())),
2268 
                    ),
1196b29b Andy McCall ↶ 2269 
                ])
2270 
            }))
2271 
        );
2272 
        return Ok(0);
2273 
    }
132b884b Andy McCall ↶ 2274 
    if tags.is_empty() {
2275 
        println!("{}", ui::dim("No tags."));
2276 
    }
2277 
    for t in tags {
2278 
        println!(
94084087 Andy McCall ↶ 2279 
            "{} {} {}{}{}{}",
2280 
            ui::ok(ui::glyph("⚑", "#")),
2281 
            ui::bookmark(&t.name),
6a81dbab Andy McCall ↶ 2282 
            // The heads, as `oxy log` shows changes, not the state hash.
2283 
            ui::hash(
2284 
                t.heads
2285 
                    .iter()
2286 
                    .map(|h| format!("#{}", h.short(12)))
2287 
                    .collect::<Vec<_>>()
2288 
                    .join(" ")
2289 
            ),
94084087 Andy McCall ↶ 2290 
            ui::sep() + &ui::dim(plural(t.heads.len(), "head")),
75167672 Andy McCall 2291 
            if t.message.is_empty() {
2292 
                String::new()
2293 
            } else {
2294 
                format!("  {}", ui::subject(subject_of(&t.message)))
2295 
            },
2296 
            t.signer
2297 
                .map(|s| ui::sep() + &ui::ok(format!("{} {s}", ui::glyph("✔", "v"))))
2298 
                .unwrap_or_default()
132b884b Andy McCall ↶ 2299 
        );
2300 
    }
2301 
    Ok(0)
a46f3e4f Andy McCall ↶ 2302 
}
2303
2304 
/// Whether `name` is a bookmark, here or only on a remote: what checkout
2305 
/// and workspace add take as "be on this bookmark" (oxygen#60).
2306 
fn names_bookmark(repo: &oxy_core::repo::Repo, name: &str) -> Result<bool> {
2307 
    Ok(repo.view()?.bookmarks.contains_key(name)
2308 
        || repo
2309 
            .remote_only_bookmarks()?
2310 
            .iter()
2311 
            .any(|b| b.name == name || format!("{}/{}", b.remote, b.name) == name))
132b884b Andy McCall ↶ 2312 
}
4e88e774 Andy McCall ↶ 2313
2314 
pub fn workspace_add(path: &std::path::Path, changes: &[String]) -> Result<i32> {
2315 
    let repo = open()?;
a46f3e4f Andy McCall ↶ 2316 
    // One bookmark named: the new workspace is on it (oxygen#60), not on
2317 
    // this workspace's bookmark with that one's files.
2318 
    if let [name] = changes {
2319 
        if names_bookmark(&repo, name)? {
2320 
            let (local, _) = repo.local_bookmark_for(name)?;
2321 
            let heads = repo.resolve_heads(&local)?;
2322 
            let sp = ui::spinner(&format!("Creating workspace at {}…", path.display()));
2323 
            let ws = repo.workspace_add_on(path, Some(&heads), Some(&local))?;
2324 
            sp.done(&format!(
2325 
                "{} {} (workspace {}) on {}",
2326 
                ui::done("Workspace created at"),
2327 
                ui::path(ws.root().display()),
2328 
                ui::id(ws.workspace().short(8)),
2329 
                ui::bookmark(&local)
2330 
            ));
2331 
            return Ok(0);
2332 
        }
2333 
    }
4e88e774 Andy McCall ↶ 2334 
    let heads = if changes.is_empty() {
2335 
        None
2336 
    } else {
2337 
        let mut heads = Vec::new();
2338 
        for c in changes {
2339 
            heads.extend(repo.resolve_heads(c)?);
2340 
        }
2341 
        Some(heads)
2342 
    };
2343 
    let sp = ui::spinner(&format!("Creating workspace at {}…", path.display()));
2344 
    let ws = repo.workspace_add(path, heads.as_deref())?;
75167672 Andy McCall 2345 
    sp.done(&format!(
2346 
        "{} {} (workspace {})",
2347 
        ui::done("Workspace created at"),
2348 
        ui::path(ws.root().display()),
2349 
        ui::id(ws.workspace().short(8))
2350 
    ));
4e88e774 Andy McCall ↶ 2351 
    Ok(0)
2352 
}
2353
1196b29b Andy McCall ↶ 2354 
pub fn workspace_list(as_json: bool) -> Result<i32> {
4e88e774 Andy McCall ↶ 2355 
    let repo = open()?;
1196b29b Andy McCall ↶ 2356 
    if as_json {
2357 
        println!(
2358 
            "{}",
2359 
            json::arr(repo.workspaces()?.iter().map(|w| {
2360 
                json::obj([
2361 
                    ("id", json::s(&w.id.to_hex())),
2362 
                    ("path", json::s(&w.path.to_string_lossy())),
2363 
                    ("current", json::b(w.current)),
75167672 Andy McCall 2364 
                    (
2365 
                        "working_copy",
2366 
                        json::opt(w.working_copy, |h| json::s(&h.to_hex())),
2367 
                    ),
1196b29b Andy McCall ↶ 2368 
                ])
2369 
            }))
2370 
        );
2371 
        return Ok(0);
2372 
    }
4e88e774 Andy McCall ↶ 2373 
    for w in repo.workspaces()? {
2374 
        println!(
2375 
            "{} {} {}{}",
75167672 Andy McCall 2376 
            if w.current {
2377 
                ui::ok(ui::glyph("●", "*"))
2378 
            } else {
2379 
                ui::dim(ui::glyph("○", "o"))
2380 
            },
4e88e774 Andy McCall ↶ 2381 
            ui::id(w.id.short(8)),
2382 
            ui::path(w.path.display()),
75167672 Andy McCall 2383 
            w.working_copy
2384 
                .map(|h| ui::sep() + &ui::dim(format!("working copy #{}", h.short(12))))
2385 
                .unwrap_or_else(|| ui::sep() + &ui::warn("not in view"))
4e88e774 Andy McCall ↶ 2386 
        );
2387 
    }
2388 
    Ok(0)
2389 
}
2390
2391 
pub fn workspace_forget(spec: &str) -> Result<i32> {
2392 
    let repo = open()?;
2393 
    let all = repo.workspaces()?;
2394 
    let target = std::fs::canonicalize(spec).ok();
75167672 Andy McCall 2395 
    let matches: Vec<_> = all
2396 
        .iter()
2397 
        .filter(|w| w.id.starts_with_hex(spec) || target.as_ref().is_some_and(|t| *t == w.path))
2398 
        .collect();
4e88e774 Andy McCall ↶ 2399 
    let w = match matches.as_slice() {
2400 
        [w] => *w,
2401 
        [] => anyhow::bail!("no workspace matches {spec:?}"),
2402 
        _ => anyhow::bail!("{spec:?} is ambiguous"),
2403 
    };
2404 
    repo.workspace_forget(&w.id)?;
75167672 Andy McCall 2405 
    println!(
2406 
        "{} workspace {} at {}; its files were left in place.",
2407 
        ui::done("Forgot"),
2408 
        ui::id(w.id.short(8)),
2409 
        ui::path(w.path.display())
2410 
    );
4e88e774 Andy McCall ↶ 2411 
    Ok(0)
2412 
}
cdb5beba Andy McCall ↶ 2413
2414 
pub fn lock(path: &str) -> Result<i32> {
2415 
    let repo = open()?;
2416 
    repo.lock_path(path)?;
75167672 Andy McCall 2417 
    println!(
2418 
        "{} {} {}",
2419 
        ui::done("Locked"),
2420 
        ui::path(path),
2421 
        ui::dim("(advisory, local)")
2422 
    );
cdb5beba Andy McCall ↶ 2423 
    Ok(0)
2424 
}
2425
2426 
pub fn unlock(path: &str) -> Result<i32> {
2427 
    let repo = open()?;
2428 
    repo.unlock_path(path)?;
94084087 Andy McCall ↶ 2429 
    println!("{} {}", ui::done("Unlocked"), ui::path(path));
cdb5beba Andy McCall ↶ 2430 
    Ok(0)
2431 
}
23b217d7 Andy McCall ↶ 2432
2433 
pub fn split(change: &str, paths: &[String]) -> Result<i32> {
2434 
    let repo = open()?;
2435 
    let h = repo.resolve_change(change)?;
2436 
    let (h1, h2) = repo.split(&h, paths)?;
631fc897 Andy McCall ↶ 2437 
    let c1 = repo.store().get_change_meta(&h1)?;
2438 
    let c2 = repo.store().get_change_meta(&h2)?;
75167672 Andy McCall 2439 
    println!(
2440 
        "{} into {} {} and {} {}",
2441 
        ui::done("Split"),
631fc897 Andy McCall ↶ 2442 
        ui::id(c1.change_id.short(8)),
75167672 Andy McCall 2443 
        ui::hash(format!("#{}", h1.short(12))),
631fc897 Andy McCall ↶ 2444 
        ui::id(c2.change_id.short(8)),
75167672 Andy McCall 2445 
        ui::hash(format!("#{}", h2.short(12)))
2446 
    );
23b217d7 Andy McCall ↶ 2447 
    Ok(0)
2448 
}
7b9809e6 Andy McCall ↶ 2449
2450 
fn heads_from(repo: &Repo, changes: &[String]) -> Result<Vec<oxy_core::hash::ChangeHash>> {
2451 
    let mut heads = Vec::new();
2452 
    for c in changes {
2453 
        heads.extend(repo.resolve_heads(c)?);
2454 
    }
2455 
    Ok(heads)
2456 
}
2457
4fe7d604 Andy McCall ↶ 2458 
pub fn bookmark_create(name: &str, changes: &[String], upto: bool, only: bool) -> Result<i32> {
7b9809e6 Andy McCall ↶ 2459 
    let repo = open()?;
cc7a0056 Andy McCall ↶ 2460 
    repo.snapshot_status("oxy bookmark create")?;
75167672 Andy McCall 2461 
    let heads = if changes.is_empty() {
2462 
        None
2463 
    } else {
4fe7d604 Andy McCall ↶ 2464 
        let named = heads_from(&repo, changes)?;
2465 
        let (_, wc) = repo.working_copy()?;
2466 
        let gap = repo.state_gap(&wc.deps, &named)?;
2467 
        if upto {
2468 
            Some(gap.upto)
2469 
        } else if only || gap.earlier.is_empty() {
2470 
            Some(named)
2471 
        } else {
2472 
            anyhow::bail!(
2473 
                "{name} at {} would lack {} of the current state recorded before it:\n{}\n\
2474 
                 A state is its heads and what they depend on, not everything recorded before them.\n\
2475 
                 Pass --upto for everything of the current state up to {0} (as a Git branch would hold),\n\
2476 
                 or --only for just {0} and what it depends on.",
2477 
                changes.join(" "),
2478 
                plural(gap.earlier.len(), "change"),
2479 
                listed_changes(&repo, &gap.earlier)
2480 
            );
2481 
        }
75167672 Andy McCall 2482 
    };
7b9809e6 Andy McCall ↶ 2483 
    let heads = repo.bookmark_create(name, heads.as_deref())?;
75167672 Andy McCall 2484 
    println!(
2485 
        "{} bookmark {} {} {}",
2486 
        ui::done("Created"),
2487 
        ui::bookmark(name),
2488 
        ui::dim(ui::glyph("→", "->")),
2489 
        ui::dim(plural(heads.len(), "head"))
2490 
    );
2491 
    println!(
2492 
        "  {} {}",
2493 
        ui::note(),
2494 
        ui::dim(format!("switch to it with oxy bookmark switch {name}"))
2495 
    );
7b9809e6 Andy McCall ↶ 2496 
    Ok(0)
2497 
}
2498
4fe7d604 Andy McCall ↶ 2499 
/// Up to five changes, newest last, as `  #hash subject` lines.
2500 
fn listed_changes(repo: &Repo, changes: &[oxy_core::hash::ChangeHash]) -> String {
2501 
    let shown = changes.len().min(5);
2502 
    let mut lines: Vec<String> = changes[changes.len() - shown..]
2503 
        .iter()
2504 
        .map(|h| {
2505 
            let subject = repo
2506 
                .store()
2507 
                .get_change(h)
2508 
                .map(|c| subject_of(&c.message).to_string())
2509 
                .unwrap_or_default();
2510 
            format!("  #{} {subject}", h.short(12))
2511 
        })
2512 
        .collect();
2513 
    if changes.len() > shown {
2514 
        lines.insert(0, format!("  … and {} earlier", changes.len() - shown));
2515 
    }
2516 
    lines.join("\n")
2517 
}
2518
06d16dc2 Andy McCall ↶ 2519 
pub fn bookmark_set(name: &str, changes: &[String], upto: bool, only: bool) -> Result<i32> {
7b9809e6 Andy McCall ↶ 2520 
    let repo = open()?;
cc7a0056 Andy McCall ↶ 2521 
    repo.snapshot_status("oxy bookmark set")?;
06d16dc2 Andy McCall ↶ 2522 
    let named = heads_from(&repo, changes)?;
2523 
    // What the bookmark holds now and the new heads would leave out.
2524 
    let current = repo
2525 
        .bookmarks()?
2526 
        .into_iter()
2527 
        .find(|b| b.name == name)
2528 
        .map(|b| b.heads)
2529 
        .ok_or_else(|| anyhow::anyhow!("no bookmark {name}"))?;
2530 
    let gap = repo.state_gap(&current, &named)?;
4afab467 Andy McCall ↶ 2531 
    // A fast-forward: the new heads hold the bookmark's newest head, so
2532 
    // what they leave out is older work nothing since has built on, such
2533 
    // as an early change no later one depends on (oxygen#78). Keep it, as
2534 
    // --upto does, and say so.
2535 
    let newest = current
2536 
        .iter()
2537 
        .filter_map(|h| repo.store().get_change_meta(h).ok().map(|m| (m.hlc, *h)))
2538 
        .max()
2539 
        .map(|(_, h)| h);
2540 
    // Ahead, too: a head the bookmark holds already (it would only drop
2541 
    // the others) is not a move forward.
2542 
    let ahead = repo
2543 
        .load_state_history(&current)
2544 
        .is_ok_and(|st| named.iter().any(|h| !st.contains(h)));
2545 
    let forward = !only
2546 
        && ahead
2547 
        && !gap.earlier.is_empty()
2548 
        && newest.is_some_and(|n| {
2549 
            repo.load_state_history(&named)
2550 
                .is_ok_and(|st| st.contains(&n))
2551 
        });
06d16dc2 Andy McCall ↶ 2552 
    let heads = if upto {
4afab467 Andy McCall ↶ 2553 
        gap.upto
2554 
    } else if forward {
2555 
        println!(
2556 
            "  {} {}",
2557 
            ui::note(),
2558 
            ui::dim(format!(
2559 
                "{} builds on {name}'s newest head; keeping {} it holds that {0} does not depend on",
2560 
                changes.join(" "),
2561 
                plural(gap.earlier.len(), "change")
2562 
            ))
2563 
        );
06d16dc2 Andy McCall ↶ 2564 
        gap.upto
2565 
    } else if only || gap.earlier.is_empty() {
2566 
        named
2567 
    } else {
2568 
        anyhow::bail!(
2569 
            "{name} at {} would lose {} it holds now, recorded before it:\n{}\n\
2570 
             A state is its heads and what they depend on, not everything recorded before them.\n\
2571 
             Pass --upto to keep everything {name} holds up to {0} (as a Git branch would),\n\
2572 
             or --only for just {0} and what it depends on.",
2573 
            changes.join(" "),
2574 
            plural(gap.earlier.len(), "change"),
2575 
            listed_changes(&repo, &gap.earlier)
2576 
        );
2577 
    };
7b9809e6 Andy McCall ↶ 2578 
    let heads = repo.bookmark_set(name, &heads)?;
75167672 Andy McCall 2579 
    println!(
2580 
        "{} bookmark {} {} {}",
2581 
        ui::done("Moved"),
2582 
        ui::bookmark(name),
2583 
        ui::dim(ui::glyph("→", "->")),
2584 
        ui::dim(plural(heads.len(), "head"))
2585 
    );
7b9809e6 Andy McCall ↶ 2586 
    Ok(0)
2587 
}
2588
2589 
pub fn bookmark_delete(name: &str) -> Result<i32> {
2590 
    let repo = open()?;
2591 
    repo.bookmark_delete(name)?;
75167672 Andy McCall 2592 
    println!(
2593 
        "{} bookmark {} {}",
2594 
        ui::done("Deleted"),
2595 
        ui::bookmark(name),
2596 
        ui::dim("(its changes stay until unreachable)")
2597 
    );
7b9809e6 Andy McCall ↶ 2598 
    Ok(0)
2599 
}
2600
bf3a6781 Andy McCall ↶ 2601 
/// Heads with their metadata, newest first.
2602 
fn heads_newest_first(
2603 
    repo: &Repo,
2604 
    heads: &[oxy_core::hash::ChangeHash],
2605 
) -> Vec<(oxy_core::hash::ChangeHash, oxy_core::state::ChangeMeta)> {
2606 
    let mut out: Vec<_> = heads
2607 
        .iter()
2608 
        .filter_map(|h| repo.store().get_change_meta(h).ok().map(|m| (*h, m)))
2609 
        .collect();
2610 
    out.sort_by_key(|(_, m)| std::cmp::Reverse(m.hlc));
2611 
    out
2612 
}
2613
2614 
/// One head as a line: id, hash, author, when, subject.
2615 
fn print_head(
2616 
    repo: &Repo,
2617 
    indent: &str,
2618 
    h: &oxy_core::hash::ChangeHash,
2619 
    m: &oxy_core::state::ChangeMeta,
2620 
) {
2621 
    println!(
2622 
        "{indent}{} {} {}{}{}{}{}",
2623 
        ui::id(m.change_id.short(8)),
2624 
        ui::dim(format!("#{}", &h.to_hex()[..8])),
2625 
        author_name(repo, m),
2626 
        ui::sep(),
2627 
        ui::dim(ui::ago(m.hlc.wall_ms)),
2628 
        ui::sep(),
2629 
        ui::subject(subject_of(&m.message))
2630 
    );
2631 
}
2632
2633 
pub fn bookmark_show(name: Option<&str>, as_json: bool) -> Result<i32> {
7b9809e6 Andy McCall ↶ 2634 
    let repo = open()?;
bf3a6781 Andy McCall ↶ 2635 
    let name = name.unwrap_or(&repo.config.bookmark).to_string();
2636 
    let view = repo.view()?;
2637 
    let st = match view.bookmarks.get(&name) {
2638 
        Some(st) => *st,
2639 
        None => match oxy_core::repo::remote_bookmark(&view, &name) {
2640 
            Some((_, _, st)) => st,
2641 
            None => anyhow::bail!("no bookmark {name}: oxy bookmark list --all lists them"),
2642 
        },
2643 
    };
2644 
    let heads = repo.store().get_state(&st)?.heads;
2645 
    let shown = heads_newest_first(&repo, &heads);
2646 
    if as_json {
2647 
        println!(
2648 
            "{}",
2649 
            json::obj([
2650 
                ("name", json::s(&name)),
2651 
                ("current", json::b(name == repo.config.bookmark)),
2652 
                (
2653 
                    "heads",
2654 
                    json::arr(shown.iter().map(|(h, m)| {
2655 
                        json::obj([
2656 
                            ("hash", json::s(&h.to_hex())),
2657 
                            ("id", json::s(&m.change_id.to_string())),
2658 
                            ("author", json::s(&author_name(&repo, m))),
2659 
                            ("time_ms", json::n(m.hlc.wall_ms)),
2660 
                            ("subject", json::s(subject_of(&m.message))),
2661 
                        ])
2662 
                    }))
2663 
                ),
2664 
            ])
2665 
        );
2666 
        return Ok(0);
2667 
    }
2668 
    println!(
2669 
        "{} {}{}{}",
2670 
        ui::ok(ui::glyph("●", "*")),
2671 
        ui::bookmark(&name),
2672 
        ui::sep(),
2673 
        ui::dim(plural(heads.len(), "head"))
2674 
    );
2675 
    for (h, m) in &shown {
2676 
        print_head(&repo, "  ", h, m);
2677 
    }
2678 
    if heads.len() > 1 {
2679 
        println!(
2680 
            "  {}",
2681 
            ui::dim("None depends on another: the bookmark is all of them and their dependencies.")
2682 
        );
2683 
    }
2684 
    Ok(0)
2685 
}
2686
2687 
pub fn bookmark_list(all: bool, verbose: bool, as_json: bool) -> Result<i32> {
2688 
    let repo = open()?;
14edbaaf Andy McCall ↶ 2689 
    let remote_only = repo.remote_only_bookmarks()?;
c6aa5bd9 Andy McCall ↶ 2690 
    if as_json {
14edbaaf Andy McCall ↶ 2691 
        let mut items: Vec<String> = repo
2692 
            .bookmarks()?
2693 
            .into_iter()
2694 
            .map(|b| {
2695 
                json::obj([
2696 
                    ("name", json::s(&b.name)),
2697 
                    ("heads", json::hashes(&b.heads)),
2698 
                    ("current", json::b(b.current)),
2699 
                    ("ahead", json::opt(b.ahead, json::n)),
2700 
                    ("behind", json::opt(b.behind, json::n)),
42ccf504 Andy McCall ↶ 2701 
                    ("remote", json::opt(b.remote.as_deref(), json::s)),
14edbaaf Andy McCall ↶ 2702 
                ])
2703 
            })
2704 
            .collect();
2705 
        if all {
2706 
            items.extend(remote_only.iter().map(|b| {
2707 
                json::obj([
2708 
                    ("name", json::s(&format!("{}/{}", b.remote, b.name))),
2709 
                    ("heads", json::hashes(&b.heads)),
2710 
                    ("current", json::b(false)),
2711 
                    ("ahead", "null".into()),
2712 
                    ("behind", "null".into()),
2713 
                    ("remote", json::s(&b.remote)),
2714 
                ])
2715 
            }));
2716 
        }
c6aa5bd9 Andy McCall ↶ 2717 
        println!("{}", json::arr(items));
2718 
        return Ok(0);
2719 
    }
7b9809e6 Andy McCall ↶ 2720 
    for b in repo.bookmarks()? {
75167672 Andy McCall 2721 
        let mark = if b.current {
2722 
            ui::ok(ui::glyph("●", "*"))
2723 
        } else {
2724 
            ui::dim(ui::glyph("○", "o"))
2725 
        };
7b9809e6 Andy McCall ↶ 2726 
        let mut tail = String::new();
2727 
        if let Some(n) = b.ahead.filter(|n| *n > 0) {
2728 
            tail += &ui::ok(format!(" {}{n}", ui::glyph("↑", "+")));
2729 
        }
2730 
        if let Some(n) = b.behind.filter(|n| *n > 0) {
2731 
            tail += &ui::warn(format!(" {}{n}", ui::glyph("↓", "-")));
2732 
        }
42ccf504 Andy McCall ↶ 2733 
        // Which remote, when there is a choice (oxygen#83).
2734 
        if !tail.is_empty() && repo.config.remotes.len() > 1 {
2735 
            if let Some(r) = &b.remote {
2736 
                tail += &ui::dim(format!(" {r}"));
2737 
            }
2738 
        }
bf3a6781 Andy McCall ↶ 2739 
        let shown = heads_newest_first(&repo, &b.heads);
2740 
        // The newest head's subject, so a busy bookmark shows its latest work.
2741 
        let head = match shown.first() {
2742 
            Some(_) if verbose => String::new(),
2743 
            Some((_, m)) if b.heads.len() > 1 => format!(
2744 
                "{} {}",
2745 
                ui::dim("newest"),
2746 
                ui::subject(subject_of(&m.message))
2747 
            ),
2748 
            Some((_, m)) => ui::subject(subject_of(&m.message)),
2749 
            None => ui::dim("(empty)"),
2750 
        };
2751 
        let head = if head.is_empty() {
2752 
            head
2753 
        } else {
2754 
            format!("  {head}")
2755 
        };
75167672 Andy McCall 2756 
        println!(
bf3a6781 Andy McCall ↶ 2757 
            "{mark} {}{}{}{tail}{head}",
75167672 Andy McCall 2758 
            ui::bookmark(&b.name),
14edbaaf Andy McCall ↶ 2759 
            ui::sep(),
2760 
            ui::dim(plural(b.heads.len(), "head"))
2761 
        );
bf3a6781 Andy McCall ↶ 2762 
        if verbose {
2763 
            for (h, m) in &shown {
2764 
                print_head(&repo, "    ", h, m);
2765 
            }
2766 
        }
14edbaaf Andy McCall ↶ 2767 
    }
2768 
    if remote_only.is_empty() {
2769 
        return Ok(0);
2770 
    }
2771 
    if !all {
2772 
        println!(
2773 
            "{}",
2774 
            ui::dim(format!(
2775 
                "  and {} only on a remote: oxy bookmark list --all",
2776 
                plural(remote_only.len(), "bookmark")
2777 
            ))
2778 
        );
2779 
        return Ok(0);
2780 
    }
2781 
    for b in &remote_only {
2782 
        println!(
2783 
            "{} {}{}{}",
2784 
            ui::dim(ui::glyph("◌", ".")),
2785 
            ui::dim(format!("{}/{}", b.remote, b.name)),
75167672 Andy McCall 2786 
            ui::sep(),
2787 
            ui::dim(plural(b.heads.len(), "head"))
2788 
        );
7b9809e6 Andy McCall ↶ 2789 
    }
14edbaaf Andy McCall ↶ 2790 
    println!(
2791 
        "  {} {}",
2792 
        ui::note(),
2793 
        ui::dim("oxy bookmark switch NAME makes a local bookmark from a remote's")
2794 
    );
7b9809e6 Andy McCall ↶ 2795 
    Ok(0)
2796 
}
2797
61e3bce7 Andy McCall ↶ 2798 
pub fn bookmark_switch(name: &str, discard: bool, carry: bool) -> Result<i32> {
7b9809e6 Andy McCall ↶ 2799 
    let mut repo = open()?;
4fe7d604 Andy McCall ↶ 2800 
    let from = repo.config.bookmark.clone();
14edbaaf Andy McCall ↶ 2801 
    let (local, created_from) = repo.local_bookmark_for(name)?;
2802 
    if let Some(remote) = created_from {
2803 
        println!(
2804 
            "{} {} from {}",
2805 
            ui::done("Created"),
2806 
            ui::bookmark(&local),
2807 
            ui::dim(format!("{remote}/{local}"))
2808 
        );
2809 
    }
2810 
    let name = local.as_str();
72484195 Andy McCall ↶ 2811 
    // Only behind its remote: take the remote's state, so the switch does
2812 
    // not check out a stale one (oxygen#74).
2813 
    if let Some(n) = repo.catch_up_bookmark(name)? {
2814 
        println!(
2815 
            "{} {} with {}: {} it lacked",
2816 
            ui::done("Caught up"),
2817 
            ui::bookmark(name),
2818 
            ui::dim(format!("{}/{name}", repo.default_remote())),
2819 
            plural(n, "change")
2820 
        );
2821 
    }
7b9809e6 Andy McCall ↶ 2822 
    let sp = ui::spinner(&format!("Switching to {name}…"));
61e3bce7 Andy McCall ↶ 2823 
    let (r, carried) = if carry {
2824 
        repo.bookmark_switch_carry(name)?
2825 
    } else {
2826 
        (repo.bookmark_switch(name, discard)?, vec![])
2827 
    };
75167672 Andy McCall 2828 
    sp.done(&format!(
61e3bce7 Andy McCall ↶ 2829 
        "{} to {}: {} written, {} removed{}",
75167672 Andy McCall 2830 
        ui::done("Switched"),
2831 
        ui::bookmark(name),
2832 
        plural(r.written, "file"),
61e3bce7 Andy McCall ↶ 2833 
        r.removed,
2834 
        if carried.is_empty() {
2835 
            String::new()
2836 
        } else {
2837 
            format!("; carried {}", plural(carried.len(), "changed path"))
2838 
        }
75167672 Andy McCall 2839 
    ));
9b723f69 Andy McCall ↶ 2840 
    print_removed(&r);
7b9809e6 Andy McCall ↶ 2841 
    if r.conflicted {
75167672 Andy McCall 2842 
        println!(
2843 
            "  {} {}",
2844 
            ui::caution(),
2845 
            ui::warn("this state has conflicts; see oxy status")
2846 
        );
4fe7d604 Andy McCall ↶ 2847 
    }
2848 
    // Say when the new state leaves out work the old one had: a state is
2849 
    // its heads and what they depend on, which can be far less than a Git
2850 
    // user expects.
d3cd7ef9 Andy McCall ↶ 2851 
    if r.lacks > 0 {
2852 
        println!(
2853 
            "  {} {}",
2854 
            ui::note(),
2855 
            ui::dim(format!(
2856 
                "{name} lacks {} that {from} has",
2857 
                plural(r.lacks, "change")
2858 
            ))
2859 
        );
7b9809e6 Andy McCall ↶ 2860 
    }
14edbaaf Andy McCall ↶ 2861 
    super::sync::subrepos_behind(&repo);
98a1620a Andy McCall ↶ 2862 
    where_now(&repo);
7b9809e6 Andy McCall ↶ 2863 
    Ok(0)
2864 
}
2865
2866 
pub fn merge(bookmark: &str) -> Result<i32> {
2867 
    let repo = open()?;
2868 
    let sp = ui::spinner(&format!("Merging {bookmark}…"));
2869 
    let r = repo.merge(bookmark)?;
2870 
    if !r.changed {
75167672 Andy McCall 2871 
        sp.done(&format!(
2872 
            "{} {}",
2873 
            ui::ok(ui::glyph("✔", "*")),
2874 
            ui::dim(format!(
2875 
                "{} already contains {bookmark}",
2876 
                repo.config.bookmark
2877 
            ))
2878 
        ));
7b9809e6 Andy McCall ↶ 2879 
        return Ok(0);
2880 
    }
2881 
    sp.done(&format!(
2882 
        "{} {} into {}: now {}{}",
2883 
        ui::done("Merged"),
2884 
        ui::bookmark(bookmark),
2885 
        ui::bookmark(&repo.config.bookmark),
2886 
        plural(r.heads.len(), "head"),
75167672 Andy McCall 2887 
        ui::dim(if r.checked_out {
2888 
            "; working copy updated"
2889 
        } else {
2890 
            "; run oxy checkout to update the working copy"
2891 
        })
7b9809e6 Andy McCall ↶ 2892 
    ));
2893 
    let snap = repo.snapshot("oxy merge")?;
2894 
    if snap.base_snapshot.is_conflicted() {
75167672 Andy McCall 2895 
        println!(
2896 
            "  {} {}",
2897 
            ui::caution(),
2898 
            ui::warn("the result has conflicts; see oxy status")
2899 
        );
7b9809e6 Andy McCall ↶ 2900 
    }
98a1620a Andy McCall ↶ 2901 
    where_now(&repo);
7b9809e6 Andy McCall ↶ 2902 
    Ok(0)
2903 
}
2904
728da0f9 Andy McCall ↶ 2905 
pub fn squash(change: &str, into: &str) -> Result<i32> {
2906 
    let repo = open()?;
2907 
    let c = repo.resolve_change(change)?;
2908 
    let d = repo.resolve_change(into)?;
2909 
    let sp = ui::spinner("Squashing…");
2910 
    let h = repo.squash(&c, &d)?;
631fc897 Andy McCall ↶ 2911 
    let new = repo.store().get_change_meta(&h)?;
75167672 Andy McCall 2912 
    sp.done(&format!(
2913 
        "{} into {} {}  {}",
2914 
        ui::done("Squashed"),
631fc897 Andy McCall ↶ 2915 
        ui::id(new.change_id.short(8)),
75167672 Andy McCall 2916 
        ui::hash(format!("#{}", h.short(12))),
2917 
        ui::subject(subject_of(&new.message))
2918 
    ));
728da0f9 Andy McCall ↶ 2919 
    Ok(0)
2920 
}
2921
e266b7d4 Andy McCall ↶ 2922 
pub fn rebase(change: &str, onto: &[String], into_working_copy: bool) -> Result<i32> {
728da0f9 Andy McCall ↶ 2923 
    let repo = open()?;
2924 
    let c = repo.resolve_change(change)?;
2925 
    let mut heads = Vec::new();
2926 
    for o in onto {
2927 
        heads.extend(repo.resolve_heads(o)?);
2928 
    }
2929 
    let sp = ui::spinner("Rebasing…");
e266b7d4 Andy McCall ↶ 2930 
    let h = match repo.rebase(&c, &heads) {
2931 
        Err(oxy_core::repo::RepoError::Conflicted(_)) if into_working_copy => {
2932 
            let r = repo.rebase_into_working_copy(&c, &heads)?;
2933 
            sp.done(&format!(
2934 
                "{} {} into {}: now {}",
2935 
                ui::done("Merged"),
2936 
                onto.join(" "),
2937 
                ui::bookmark(&repo.config.bookmark),
2938 
                plural(r.heads.len(), "head"),
2939 
            ));
2940 
            if r.checked_out {
2941 
                println!(
2942 
                    "  {} {}",
2943 
                    ui::caution(),
2944 
                    ui::warn("the conflict is in the working copy: fix the marked files (see oxy status), then oxy commit")
2945 
                );
2946 
            } else {
2947 
                println!(
2948 
                    "  {} {}",
2949 
                    ui::caution(),
2950 
                    ui::warn("the working copy has changes of its own: commit or discard them, then oxy checkout to take the conflict in")
2951 
                );
2952 
            }
98a1620a Andy McCall ↶ 2953 
            where_now(&repo);
e266b7d4 Andy McCall ↶ 2954 
            return Ok(0);
2955 
        }
2956 
        other => other?,
2957 
    };
631fc897 Andy McCall ↶ 2958 
    let new = repo.store().get_change_meta(&h)?;
75167672 Andy McCall 2959 
    sp.done(&format!(
2960 
        "{} {} {}  {}",
2961 
        ui::done("Rebased"),
631fc897 Andy McCall ↶ 2962 
        ui::id(new.change_id.short(8)),
75167672 Andy McCall 2963 
        ui::hash(format!("#{}", h.short(12))),
2964 
        ui::dim(format!(
2965 
            "now depends on {}",
2966 
            plural(new.deps.len(), "change")
2967 
        ))
2968 
    ));
98a1620a Andy McCall ↶ 2969 
    where_now(&repo);
728da0f9 Andy McCall ↶ 2970 
    Ok(0)
79b5a90f Andy McCall ↶ 2971 
}
2972
2973 
#[cfg(test)]
2974 
mod tests {
2975 
    use super::*;
2976
2977 
    #[test]
2978 
    fn id_prefixes_agree_with_the_whole_list() {
2979 
        // Ids that share long prefixes, and some that differ only in a
2980 
        // half byte, from a fixed sequence.
2981 
        let mut x: u64 = 0x9e37_79b9_7f4a_7c15;
2982 
        let mut next = || {
2983 
            x ^= x << 13;
2984 
            x ^= x >> 7;
2985 
            x ^= x << 17;
2986 
            x
2987 
        };
2988 
        let mut ids: Vec<[u8; 16]> = Vec::new();
2989 
        for _ in 0..2000 {
2990 
            let mut id = [0u8; 16];
2991 
            id[..8].copy_from_slice(&next().to_le_bytes());
2992 
            id[8..].copy_from_slice(&next().to_le_bytes());
2993 
            let share = (next() % 4) as usize;
2994 
            if let Some(prev) = ids.last() {
2995 
                id[..share].copy_from_slice(&prev[..share]);
2996 
                if next() % 2 == 0 {
2997 
                    id[share] = (prev[share] & 0xf0) | (id[share] & 0x0f);
2998 
                }
2999 
            }
3000 
            ids.push(id);
3001 
        }
3002 
        let hex = |id: &[u8; 16]| oxy_core::ids::ChangeId(*id).to_hex();
3003 
        let whole = unique_prefixes(ids.iter().map(hex));
3004 
        let some = id_prefixes(ids.clone(), ids.iter().copied());
3005 
        for id in &ids {
3006 
            assert_eq!(some[id], whole[&hex(id)], "{}", hex(id));
3007 
        }
3008 
    }
728da0f9 Andy McCall ↶ 3009 
}