OXYGENHUB
# 16aa9e03d85b oxygen / src / cli / sync.rs
37.1 KiB · Rust · last changed A refused checkout token falls back to this computer's sign-in for the hub, and says so (closes #155) 7 days ago source blame history raw
fce44ae9 Andy McCall ↶ 1 
//! Commands that talk to remotes, and the reference server.
2
3 
use super::format::plural;
75167672 Andy McCall 4 
use super::json;
fce44ae9 Andy McCall ↶ 5 
use super::open;
135212de Andy McCall ↶ 6 
use super::ui;
fce44ae9 Andy McCall ↶ 7 
use anyhow::{Context, Result};
8 
use oxy_core::repo::Repo;
9 
use std::path::PathBuf;
10
75167672 Andy McCall 11 
pub fn clone(
12 
    url: &str,
13 
    dest: Option<PathBuf>,
14 
    max_blob: Option<&str>,
15 
    sparse: &[String],
16 
    depth: Option<u32>,
14edbaaf Andy McCall ↶ 17 
    recursive: bool,
75167672 Andy McCall 18 
) -> Result<i32> {
fce44ae9 Andy McCall ↶ 19 
    let dest = dest.unwrap_or_else(|| {
75167672 Andy McCall 20 
        let base = url
21 
            .trim_end_matches('/')
22 
            .rsplit('/')
23 
            .next()
24 
            .unwrap_or("repo");
fce44ae9 Andy McCall ↶ 25 
        PathBuf::from(base)
26 
    });
b3c5a59a Andy McCall ↶ 27 
    let max_blob = max_blob.map(oxy_core::repo::parse_size).transpose()?;
135212de Andy McCall ↶ 28 
    let sp = ui::spinner(&format!("Cloning {url}…"));
d36ba2f7 Andy McCall ↶ 29 
    let (repo, skipped) = Repo::clone_reporting(url, &dest, max_blob, sparse, depth)?;
fce44ae9 Andy McCall ↶ 30 
    let heads = repo.bookmark_heads()?;
75167672 Andy McCall 31 
    sp.done(&format!(
32 
        "{} into {} {}",
33 
        ui::done("Cloned"),
34 
        ui::path(repo.root().display()),
35 
        ui::dim(format!(
36 
            "({url}, {} with {})",
37 
            ui::bookmark(&repo.config.bookmark),
38 
            plural(heads.len(), "head")
39 
        ))
40 
    ));
d36ba2f7 Andy McCall ↶ 41 
    warn_skipped(&skipped);
14edbaaf Andy McCall ↶ 42 
    let others = repo.remote_only_bookmarks()?.len();
43 
    if others > 0 {
44 
        println!(
45 
            "  {} {}",
46 
            ui::note(),
47 
            ui::dim(format!(
48 
                "origin has {} more: oxy bookmark list --all, then oxy bookmark switch NAME",
49 
                plural(others, "bookmark")
50 
            ))
51 
        );
52 
    }
53 
    let subrepos = repo.subrepos()?.len();
54 
    if subrepos == 0 {
55 
        return Ok(0);
56 
    }
57 
    if recursive {
58 
        let sp = ui::spinner("Cloning subrepos…");
59 
        let results = repo.submodule_update(true, &[])?;
60 
        sp.clear();
61 
        return Ok(print_subrepo_results(results));
62 
    }
63 
    println!(
64 
        "  {} {}",
65 
        ui::note(),
66 
        ui::dim(format!(
67 
            "{} not cloned: oxy submodule update --init (or clone with --recursive)",
68 
            plural(subrepos, "subrepo")
69 
        ))
70 
    );
fce44ae9 Andy McCall ↶ 71 
    Ok(0)
72 
}
73
14edbaaf Andy McCall ↶ 74 
/// After a switch or pull: say when subrepos are not at their pins.
75 
pub fn subrepos_behind(repo: &Repo) {
76 
    let Ok(subs) = repo.subrepos() else {
77 
        return;
78 
    };
79 
    let stale = subs
80 
        .iter()
81 
        .filter(|s| s.committed && s.actual.as_ref() != Some(&s.pin))
82 
        .count();
83 
    if stale > 0 {
84 
        println!(
85 
            "  {} {}",
86 
            ui::note(),
87 
            ui::dim(format!(
88 
                "{} not at {} pin: oxy submodule update --init",
89 
                plural(stale, "subrepo"),
90 
                if stale == 1 { "its" } else { "their" }
91 
            ))
92 
        );
93 
    }
94 
}
95
9aa39904 Andy McCall ↶ 96 
/// Whether a URL names a store (a bucket or a directory in the store
97 
/// layout) rather than a repository.
98 
fn is_store_url(url: &str) -> bool {
99 
    ["s3://", "gs://", "az://", "dir://"]
100 
        .iter()
101 
        .any(|p| url.starts_with(p))
102 
}
103
104 
/// Percent-encode what would break a query parameter.
105 
fn encode_param(v: &str) -> String {
106 
    let mut out = String::with_capacity(v.len());
107 
    for b in v.bytes() {
108 
        match b {
109 
            b'A'..=b'Z' | b'a'..=b'z' | b'0'..=b'9' | b'-' | b'_' | b'.' | b'~' | b'/' | b':' => {
110 
                out.push(b as char)
111 
            }
112 
            _ => out.push_str(&format!("%{b:02X}")),
113 
        }
114 
    }
115 
    out
116 
}
117
118 
/// A store URL with settings added as query parameters, which is where a
119 
/// store remote keeps them (`s3://b/p?profile=work&region=eu-west-2`).
120 
fn url_with_settings(url: &str, settings: &[(&str, Option<String>)]) -> Result<String> {
121 
    let given: Vec<(&str, &str)> = settings
122 
        .iter()
123 
        .filter_map(|(k, v)| v.as_deref().map(|v| (*k, v)))
124 
        .collect();
125 
    if given.is_empty() {
126 
        return Ok(url.to_string());
127 
    }
128 
    if !is_store_url(url) || url.starts_with("dir://") {
129 
        let names: Vec<String> = given.iter().map(|(k, _)| format!("--{k}")).collect();
130 
        anyhow::bail!(
131 
            "{} apply to a store remote (s3://, gs://, az://), not to {url}",
132 
            names.join(", ")
133 
        );
134 
    }
135 
    let mut out = url.to_string();
136 
    for (k, v) in given {
137 
        out.push(if out.contains('?') { '&' } else { '?' });
138 
        out.push_str(k);
139 
        out.push('=');
140 
        out.push_str(&encode_param(v));
141 
    }
142 
    Ok(out)
143 
}
144
145 
pub fn remote_add(name: &str, url: &str, settings: &[(&str, Option<String>)]) -> Result<i32> {
fce44ae9 Andy McCall ↶ 146 
    let mut repo = open()?;
9aa39904 Andy McCall ↶ 147 
    let url = url_with_settings(url, settings)?;
148 
    let url = url.as_str();
827281ee Andy McCall ↶ 149 
    repo.config.set(
150 
        &format!("remote.{name}.url"),
151 
        &oxy_core::protocol::stored_url(url),
152 
    )?;
fce44ae9 Andy McCall ↶ 153 
    repo.save_config()?;
75167672 Andy McCall 154 
    println!(
155 
        "{} remote {} {} {url}",
156 
        ui::done("Added"),
157 
        ui::bookmark(name),
158 
        ui::dim(ui::glyph("→", "->"))
159 
    );
fce44ae9 Andy McCall ↶ 160 
    Ok(0)
9aa39904 Andy McCall ↶ 161 
}
162
163 
/// `oxy remote check NAME`: reach the remote with the credentials in
164 
/// hand, say what it holds, and, for a store, put it through the
165 
/// conformance check under a probe prefix (left empty afterwards).
166 
pub fn remote_check(name: &str) -> Result<i32> {
167 
    let repo = open()?;
168 
    let Some(url) = repo.config.remotes.get(name).cloned() else {
169 
        anyhow::bail!("no remote {name:?}; oxy remote list shows the remotes there are");
170 
    };
171 
    let options = repo.options_for_url(&url);
172 
    let mine = repo.id()?;
173 
    let started = std::time::Instant::now();
174 
    let sp = ui::spinner(&format!("Checking {name}…"));
175 
    let Some(store) = oxy_core::protocol::open_store(&url, &options) else {
176 
        // A hub or another repository: reach it and read its references.
177 
        let (_, remote) = repo.open_remote_at(&url)?;
178 
        let id = remote.repo_id()?;
179 
        let refs = remote.refs()?;
180 
        sp.done(&format!(
181 
            "{} {} {}",
182 
            ui::done("Reachable"),
183 
            ui::bookmark(name),
184 
            ui::dim(format!("({url}, {} ms)", started.elapsed().as_millis()))
185 
        ));
186 
        describe_holding(id, mine, refs.refs.len(), refs.tags.len(), None);
187 
        return Ok(0);
188 
    };
189 
    let store = store.with_context(|| format!("opening the store of {name}"))?;
190 
    // What it holds, in one listing and two reads.
191 
    let marker = match store.get("oxygen.toml") {
192 
        Ok(b) => Some(b),
193 
        Err(oxy_core::strata::Error::NotFound(_)) => None,
194 
        Err(e) => {
195 
            sp.clear();
196 
            return Err(anyhow::anyhow!("{e}"))
197 
                .with_context(|| format!("reaching the store of {name}"));
198 
        }
199 
    };
200 
    let reached = started.elapsed();
201 
    let bundles = store.list("bundles/")?.len();
202 
    let record = store.read_ref("refs")?;
203 
    sp.done(&format!(
204 
        "{} {} {}",
205 
        ui::done("Reachable"),
206 
        ui::bookmark(name),
207 
        ui::dim(format!("({url}, {} ms)", reached.as_millis()))
208 
    ));
209 
    match marker {
210 
        None => println!(
211 
            "  {} {}",
212 
            ui::note(),
213 
            ui::dim("holds no repository yet: oxy push NAME binds it to this one")
214 
        ),
215 
        Some(_) => {
216 
            let (id, bookmarks, tags) = match record {
217 
                Some((bytes, _)) => {
218 
                    let (id, resp) = oxy_core::protocol::wire::decode_refs(&bytes)?;
219 
                    (id, resp.refs.len(), resp.tags.len())
220 
                }
221 
                None => (mine, 0, 0),
222 
            };
223 
            describe_holding(id, mine, bookmarks, tags, Some(bundles));
224 
        }
225 
    }
226 
    // Then the behaviour a repository depends on, under a prefix of its own.
227 
    let sp = ui::spinner("Checking that the store behaves…");
228 
    let probe = format!("oxy-check-{}", std::process::id());
229 
    let began = std::time::Instant::now();
230 
    match oxy_core::strata::conformance(store.as_ref(), &probe) {
231 
        Ok(passed) => {
232 
            sp.clear();
233 
            for p in &passed {
234 
                println!("  {} {}", ui::ok(ui::glyph("✔", "*")), p);
235 
            }
236 
            println!(
237 
                "{} {}",
238 
                ui::done("Behaves"),
239 
                ui::dim(format!(
240 
                    "({} checks in {} ms; nothing left behind)",
241 
                    passed.len(),
242 
                    began.elapsed().as_millis()
243 
                ))
244 
            );
245 
            Ok(0)
246 
        }
247 
        Err(e) => {
248 
            sp.clear();
249 
            // Leave nothing behind, even after a failed check.
250 
            if let Ok(left) = store.list(&probe) {
251 
                for entry in left {
252 
                    let _ = store.delete(&entry.key);
253 
                }
254 
            }
255 
            println!("{} {}", ui::err(ui::glyph("✘", "x")), e);
256 
            println!(
257 
                "  {} {}",
258 
                ui::note(),
259 
                ui::dim("a store that fails this cannot keep a repository safely; check the service and the credentials' permissions")
260 
            );
261 
            Ok(1)
262 
        }
263 
    }
264 
}
265
266 
fn describe_holding(
267 
    id: [u8; 16],
268 
    mine: [u8; 16],
269 
    bookmarks: usize,
270 
    tags: usize,
271 
    bundles: Option<usize>,
272 
) {
273 
    let short: String = id[..6].iter().map(|b| format!("{b:02x}")).collect();
274 
    let mut what = format!(
275 
        "repository {short}: {} and {}",
276 
        plural(bookmarks, "bookmark"),
277 
        plural(tags, "tag")
278 
    );
279 
    if let Some(b) = bundles {
280 
        what.push_str(&format!(" in {}", plural(b, "bundle")));
281 
    }
282 
    if id == mine {
283 
        println!("  {} {}", ui::note(), ui::dim(format!("holds this {what}")));
284 
    } else if id == oxy_core::protocol::UNBOUND_ID {
285 
        println!("  {} {}", ui::note(), ui::dim("holds no repository yet"));
286 
    } else {
287 
        println!(
288 
            "  {} {}",
289 
            ui::caution(),
290 
            ui::warn(format!("holds another {what}; a push would be refused"))
291 
        );
292 
    }
fce44ae9 Andy McCall ↶ 293 
}
294
295 
pub fn remote_remove(name: &str) -> Result<i32> {
296 
    let mut repo = open()?;
34fad4a9 Andy McCall ↶ 297 
    repo.remove_remote(name)?;
94084087 Andy McCall ↶ 298 
    println!("{} remote {}", ui::done("Removed"), ui::bookmark(name));
fce44ae9 Andy McCall ↶ 299 
    Ok(0)
300 
}
301
c6aa5bd9 Andy McCall ↶ 302 
pub fn remote_list(as_json: bool) -> Result<i32> {
fce44ae9 Andy McCall ↶ 303 
    let repo = open()?;
304 
    let view = repo.view()?;
c6aa5bd9 Andy McCall ↶ 305 
    if as_json {
306 
        let items = repo.config.remotes.iter().map(|(name, url)| {
307 
            let bms = view.remotes.get(name).map(|b| {
308 
                json::arr(b.iter().map(|(bm, st)| {
75167672 Andy McCall 309 
                    let heads = repo
310 
                        .store()
311 
                        .get_state(st)
312 
                        .map(|s| s.heads)
313 
                        .unwrap_or_default();
c6aa5bd9 Andy McCall ↶ 314 
                    json::obj([("name", json::s(bm)), ("heads", json::hashes(&heads))])
315 
                }))
316 
            });
75167672 Andy McCall 317 
            json::obj([
318 
                ("name", json::s(name)),
319 
                ("url", json::s(url)),
dfb23a3a Andy McCall ↶ 320 
                // The CA file `remote.NAME.ca` names, for tools that talk to
321 
                // the same hub (an editor's forge view, `oh`).
322 
                (
323 
                    "ca",
324 
                    json::opt(repo.config.remote_cas.get(name), |c| json::s(c)),
325 
                ),
75167672 Andy McCall 326 
                ("bookmarks", bms.unwrap_or_else(|| "[]".into())),
327 
            ])
c6aa5bd9 Andy McCall ↶ 328 
        });
329 
        println!("{}", json::arr(items));
330 
        return Ok(0);
331 
    }
94084087 Andy McCall ↶ 332 
    if repo.config.remotes.is_empty() {
75167672 Andy McCall 333 
        println!(
334 
            "{}",
335 
            ui::dim("No remotes; add one with oxy remote add <name> <url>.")
336 
        );
94084087 Andy McCall ↶ 337 
    }
fce44ae9 Andy McCall ↶ 338 
    for (name, url) in &repo.config.remotes {
75167672 Andy McCall 339 
        println!(
340 
            "{} {}{}{}",
341 
            ui::ok(ui::glyph("⇄", "<>")),
342 
            ui::bookmark(name),
343 
            ui::sep(),
344 
            ui::dim(url)
345 
        );
fce44ae9 Andy McCall ↶ 346 
        if let Some(bms) = view.remotes.get(name) {
347 
            for (bm, st) in bms {
75167672 Andy McCall 348 
                let heads = repo
349 
                    .store()
350 
                    .get_state(st)
351 
                    .map(|s| s.heads.len())
352 
                    .unwrap_or(0);
353 
                println!(
354 
                    "    {} {}{}{}",
355 
                    ui::dim(ui::glyph("↳", "->")),
356 
                    ui::id(format!("{name}/{bm}")),
357 
                    ui::sep(),
358 
                    ui::dim(plural(heads, "head"))
359 
                );
fce44ae9 Andy McCall ↶ 360 
            }
361 
        }
362 
    }
363 
    Ok(0)
364 
}
365
b35df36b Andy McCall ↶ 366 
/// The remote named, else `origin`, else the only remote there is.
367 
fn remote_name(repo: &oxy_core::repo::Repo, remote: Option<&str>) -> String {
368 
    remote.map_or_else(|| repo.default_remote(), str::to_string)
fce44ae9 Andy McCall ↶ 369 
}
370
c6aa5bd9 Andy McCall ↶ 371 
pub fn fetch(remote: Option<&str>, as_json: bool) -> Result<i32> {
fce44ae9 Andy McCall ↶ 372 
    let repo = open()?;
b35df36b Andy McCall ↶ 373 
    let remote = remote_name(&repo, remote);
135212de Andy McCall ↶ 374 
    let sp = ui::spinner(&format!("Fetching from {remote}…"));
569802eb Andy McCall ↶ 375 
    let report = noted(&repo, &remote, repo.fetch(&remote))?;
135212de Andy McCall ↶ 376 
    sp.clear();
c6aa5bd9 Andy McCall ↶ 377 
    if as_json {
378 
        println!(
379 
            "{}",
380 
            json::obj([
381 
                ("remote", json::s(&remote)),
75167672 Andy McCall 382 
                (
383 
                    "refs",
b35df36b Andy McCall ↶ 384 
                    json::arr(report.refs.iter().map(|(name, heads, n)| {
385 
                        let t = repo.tracking(&remote, name).ok().flatten();
386 
                        json::obj([
387 
                            ("name", json::s(name)),
388 
                            ("heads", json::hashes(heads)),
389 
                            ("new", json::n(*n)),
390 
                            (
391 
                                "ahead",
392 
                                t.map_or_else(|| "null".into(), |(a, _)| json::n(a)),
393 
                            ),
394 
                            (
395 
                                "behind",
396 
                                t.map_or_else(|| "null".into(), |(_, b)| json::n(b)),
397 
                            ),
398 
                        ])
399 
                    }))
75167672 Andy McCall 400 
                ),
c6aa5bd9 Andy McCall ↶ 401 
                ("new_tags", json::n(report.new_tags)),
402 
                ("unverified", json::b(report.unverified)),
4b9d0677 Andy McCall ↶ 403 
                (
404 
                    "log_notes",
405 
                    json::arr(report.log_notes.iter().map(|n| json::s(n))),
406 
                ),
d36ba2f7 Andy McCall ↶ 407 
                ("skipped", skipped_json(&report.skipped)),
c6aa5bd9 Andy McCall ↶ 408 
            ])
409 
        );
410 
        return Ok(0);
411 
    }
94084087 Andy McCall ↶ 412 
    if report.refs.is_empty() {
75167672 Andy McCall 413 
        println!(
414 
            "{} {}",
415 
            ui::done("Fetched"),
416 
            ui::dim(format!("nothing new from {remote}"))
417 
        );
94084087 Andy McCall ↶ 418 
    }
83e0677b Andy McCall ↶ 419 
    for (name, heads, n) in &report.refs {
b35df36b Andy McCall ↶ 420 
        // What was fetched, then how the local bookmark stands against it:
421 
        // "up to date" only when the two are the same (oxygen#56).
422 
        let fetched =
423 
            (*n > 0).then(|| format!("{}{}", ui::ok(plural(*n, "new change")), ui::sep()));
424 
        let them = |k: usize| if k == 1 { "it" } else { "them" };
425 
        let standing = match repo.tracking(&remote, name).ok().flatten() {
426 
            None => ui::dim(format!("no local bookmark {name}")),
427 
            Some((0, 0)) => ui::dim(format!("{name} up to date")),
428 
            Some((0, b)) if *name == repo.config.bookmark => ui::warn(format!(
429 
                "{name} is {} behind: oxy pull to take {}",
430 
                plural(b, "change"),
431 
                them(b)
432 
            )),
433 
            Some((0, b)) => ui::warn(format!(
434 
                "{name} is {} behind: oxy bookmark switch {name} then oxy pull to take {}",
435 
                plural(b, "change"),
436 
                them(b)
437 
            )),
438 
            Some((a, 0)) => ui::dim(format!(
439 
                "{name} is {} ahead: oxy push to send {}",
440 
                plural(a, "change"),
441 
                them(a)
442 
            )),
443 
            Some((a, b)) => ui::warn(format!(
444 
                "{name} and {remote}/{name} have diverged ({a} here, {b} there): oxy pull to merge them"
445 
            )),
75167672 Andy McCall 446 
        };
b35df36b Andy McCall ↶ 447 
        let what = format!("{}{standing}", fetched.unwrap_or_default());
75167672 Andy McCall 448 
        println!(
449 
            "{} {}{}{}{}{what}",
450 
            ui::done("Fetched"),
451 
            ui::id(format!("{remote}/{name}")),
452 
            ui::sep(),
453 
            ui::dim(plural(heads.len(), "head")),
454 
            ui::sep()
455 
        );
83e0677b Andy McCall ↶ 456 
    }
132b884b Andy McCall ↶ 457 
    if report.new_tags > 0 {
75167672 Andy McCall 458 
        println!(
459 
            "  {} {}",
460 
            ui::note(),
461 
            ui::dim(format!("{} adopted", plural(report.new_tags, "tag")))
462 
        );
132b884b Andy McCall ↶ 463 
    }
83e0677b Andy McCall ↶ 464 
    if report.unverified {
75167672 Andy McCall 465 
        eprintln!(
466 
            "{} {remote} has no trust policy; nothing fetched from it was verified",
467 
            ui::caution()
468 
        );
4b9d0677 Andy McCall ↶ 469 
    }
470 
    for n in &report.log_notes {
471 
        eprintln!("{} {n}", ui::caution());
fce44ae9 Andy McCall ↶ 472 
    }
d36ba2f7 Andy McCall ↶ 473 
    warn_skipped(&report.skipped);
fce44ae9 Andy McCall ↶ 474 
    Ok(0)
d36ba2f7 Andy McCall ↶ 475 
}
476
477 
/// Bookmarks a fetch left as they were, their attestation unverifiable
478 
/// (oxygenhub#266): one warning each, naming it and why.
479 
fn warn_skipped(skipped: &[(String, String)]) {
480 
    for (name, why) in skipped {
481 
        eprintln!(
482 
            "{} {} {}",
483 
            ui::caution(),
484 
            ui::warn(format!("{name} not updated:")),
485 
            ui::dim(why)
486 
        );
487 
    }
488 
}
489
490 
fn skipped_json(skipped: &[(String, String)]) -> String {
491 
    json::arr(
492 
        skipped
493 
            .iter()
494 
            .map(|(name, why)| json::obj([("name", json::s(name)), ("reason", json::s(why))])),
495 
    )
fce44ae9 Andy McCall ↶ 496 
}
497
7d9dab13 Andy McCall ↶ 498 
/// Pull acts on the current bookmark only: name the others the fetch
499 
/// found behind their remote, which is easy to take for the current one
500 
/// (oxygen#29).
501 
fn others_behind(repo: &oxy_core::repo::Repo, remote: &str) {
502 
    let Ok(bookmarks) = repo.bookmarks() else {
503 
        return;
504 
    };
505 
    for b in bookmarks {
506 
        let Some(n) = b.behind.filter(|n| *n > 0) else {
507 
            continue;
508 
        };
509 
        if b.current {
510 
            continue;
511 
        }
512 
        println!(
513 
            "  {} {}",
514 
            ui::note(),
515 
            ui::dim(format!(
516 
                "{} is {} behind {remote}/{}: oxy bookmark switch {} then oxy pull to take {}",
517 
                b.name,
518 
                plural(n, "change"),
519 
                b.name,
520 
                b.name,
521 
                if n == 1 { "it" } else { "them" }
522 
            ))
523 
        );
524 
    }
525 
}
526
c6aa5bd9 Andy McCall ↶ 527 
pub fn pull(remote: Option<&str>, as_json: bool) -> Result<i32> {
fce44ae9 Andy McCall ↶ 528 
    let repo = open()?;
b35df36b Andy McCall ↶ 529 
    let remote = remote_name(&repo, remote);
135212de Andy McCall ↶ 530 
    let sp = ui::spinner(&format!("Pulling from {remote}…"));
569802eb Andy McCall ↶ 531 
    let r = noted(&repo, &remote, repo.pull(&remote))?;
c6aa5bd9 Andy McCall ↶ 532 
    if as_json {
533 
        sp.clear();
cc7a0056 Andy McCall ↶ 534 
        let conflicted = repo
535 
            .snapshot_status("oxy pull")?
536 
            .base_snapshot
537 
            .is_conflicted();
75167672 Andy McCall 538 
        println!(
539 
            "{}",
540 
            json::obj([
541 
                ("remote", json::s(&remote)),
7d9dab13 Andy McCall ↶ 542 
                ("bookmark", json::s(&repo.config.bookmark)),
75167672 Andy McCall 543 
                ("heads", json::hashes(&r.heads)),
544 
                ("changed", json::b(r.changed)),
545 
                ("checked_out", json::b(r.checked_out)),
14edbaaf Andy McCall ↶ 546 
                ("conflicted", json::b(conflicted)),
d36ba2f7 Andy McCall ↶ 547 
                ("others", json::arr(r.others.iter().map(|o| json::s(o)))),
548 
                ("skipped", skipped_json(&r.skipped))
75167672 Andy McCall 549 
            ])
550 
        );
c6aa5bd9 Andy McCall ↶ 551 
        return Ok(0);
552 
    }
fce44ae9 Andy McCall ↶ 553 
    if !r.changed {
75167672 Andy McCall 554 
        sp.done(&format!(
f6dccc45 Andy McCall ↶ 555 
            "{} {}{}",
75167672 Andy McCall 556 
            ui::ok(ui::glyph("✔", "*")),
7d9dab13 Andy McCall ↶ 557 
            ui::dim(format!(
558 
                "{} is up to date with {remote}.",
559 
                repo.config.bookmark
f6dccc45 Andy McCall ↶ 560 
            )),
561 
            if r.checked_out {
562 
                ui::dim(" The working copy had fallen behind it and is updated.")
563 
            } else {
564 
                String::new()
565 
            }
75167672 Andy McCall 566 
        ));
14edbaaf Andy McCall ↶ 567 
        others_pulled(&r.others);
7d9dab13 Andy McCall ↶ 568 
        others_behind(&repo, &remote);
d36ba2f7 Andy McCall ↶ 569 
        warn_skipped(&r.skipped);
f6dccc45 Andy McCall ↶ 570 
        if r.checked_out {
571 
            super::workspace::where_now(&repo);
572 
        }
fce44ae9 Andy McCall ↶ 573 
        return Ok(0);
574 
    }
135212de Andy McCall ↶ 575 
    sp.done(&format!(
576 
        "{} {} now has {}{}",
94084087 Andy McCall ↶ 577 
        ui::done("Pulled:"),
578 
        ui::bookmark(&repo.config.bookmark),
fce44ae9 Andy McCall ↶ 579 
        plural(r.heads.len(), "head"),
75167672 Andy McCall 580 
        ui::dim(if r.checked_out {
581 
            "; working copy updated"
582 
        } else {
583 
            "; run oxy checkout to update the working copy"
584 
        })
135212de Andy McCall ↶ 585 
    ));
fce44ae9 Andy McCall ↶ 586 
    let snap = repo.snapshot("oxy pull")?;
587 
    if snap.base_snapshot.is_conflicted() {
75167672 Andy McCall 588 
        println!(
589 
            "  {} {}",
590 
            ui::caution(),
591 
            ui::warn("the result has conflicts; see oxy status")
592 
        );
fce44ae9 Andy McCall ↶ 593 
    }
14edbaaf Andy McCall ↶ 594 
    others_pulled(&r.others);
7d9dab13 Andy McCall ↶ 595 
    others_behind(&repo, &remote);
d36ba2f7 Andy McCall ↶ 596 
    warn_skipped(&r.skipped);
14edbaaf Andy McCall ↶ 597 
    subrepos_behind(&repo);
98a1620a Andy McCall ↶ 598 
    super::workspace::where_now(&repo);
fce44ae9 Andy McCall ↶ 599 
    Ok(0)
600 
}
601
14edbaaf Andy McCall ↶ 602 
/// The other bookmarks a pull moved.
603 
fn others_pulled(others: &[String]) {
604 
    if others.is_empty() {
605 
        return;
606 
    }
607 
    let shown: Vec<String> = others.iter().take(8).map(ui::bookmark).collect();
608 
    let more = others.len().saturating_sub(8);
609 
    println!(
610 
        "  {} {}{}",
611 
        ui::done("Also updated"),
612 
        shown.join(", "),
613 
        if more > 0 {
614 
            ui::dim(format!(" and {more} more"))
615 
        } else {
616 
            String::new()
617 
        }
618 
    );
619 
}
620
f8c69576 Andy McCall ↶ 621 
/// `oxy push [REMOTE] --delete NAME`.
622 
pub fn push_delete(remote: Option<&str>, name: &str, as_json: bool) -> Result<i32> {
623 
    let repo = open()?;
b35df36b Andy McCall ↶ 624 
    let remote = remote_name(&repo, remote);
f8c69576 Andy McCall ↶ 625 
    let sp = ui::spinner(&format!("Deleting {remote}/{name}…"));
626 
    let results = repo.push_delete(&remote, name)?;
627 
    sp.clear();
628 
    if as_json {
629 
        println!(
630 
            "{}",
631 
            json::arr(results.iter().map(|r| {
632 
                json::obj([
633 
                    ("name", json::s(&r.name)),
634 
                    ("ok", json::b(r.ok)),
635 
                    ("reason", json::s(&r.reason)),
636 
                    ("state", json::s("")),
637 
                ])
638 
            }))
639 
        );
640 
        return Ok(if results.iter().all(|r| r.ok) { 0 } else { 1 });
641 
    }
642 
    let mut code = 0;
643 
    for r in results {
644 
        if r.ok {
645 
            println!(
646 
                "{} {}",
647 
                ui::done("Deleted"),
648 
                ui::id(format!("{remote}/{}", r.name))
649 
            );
650 
        } else {
651 
            println!(
652 
                "{} {} {}{}{}",
653 
                ui::err(ui::glyph("✖", "x")),
654 
                ui::err("Rejected"),
655 
                ui::id(format!("{remote}/{}", r.name)),
656 
                ui::sep(),
657 
                r.reason
658 
            );
659 
            code = 1;
660 
        }
661 
    }
662 
    Ok(code)
663 
}
664
75167672 Andy McCall 665 
pub fn push(
666 
    remote: Option<&str>,
667 
    force: bool,
668 
    bookmark: Option<&str>,
669 
    as_json: bool,
670 
) -> Result<i32> {
fce44ae9 Andy McCall ↶ 671 
    let repo = open()?;
b35df36b Andy McCall ↶ 672 
    let remote = remote_name(&repo, remote);
135212de Andy McCall ↶ 673 
    let sp = ui::spinner(&format!("Pushing to {remote}…"));
cb8b8082 Andy McCall ↶ 674 
    let bookmark_name = bookmark.map_or_else(|| repo.config.bookmark.clone(), String::from);
675 
    // A long push goes in parts: the spinner says which.
569802eb Andy McCall ↶ 676 
    let results = noted(
677 
        &repo,
678 
        &remote,
679 
        repo.push_bookmark_with(&remote, &bookmark_name, force, &mut |m| {
680 
            sp.set(&format!("Pushing to {remote}… {m}"))
681 
        }),
682 
    )?;
135212de Andy McCall ↶ 683 
    sp.clear();
c6aa5bd9 Andy McCall ↶ 684 
    if as_json {
75167672 Andy McCall 685 
        println!(
686 
            "{}",
687 
            json::arr(results.iter().map(|r| json::obj([
688 
                ("name", json::s(&r.name)),
689 
                ("ok", json::b(r.ok)),
690 
                ("reason", json::s(&r.reason))
691 
            ])))
692 
        );
c6aa5bd9 Andy McCall ↶ 693 
        return Ok(if results.iter().all(|r| r.ok) { 0 } else { 1 });
694 
    }
fce44ae9 Andy McCall ↶ 695 
    let mut code = 0;
135212de Andy McCall ↶ 696 
    for r in results {
fce44ae9 Andy McCall ↶ 697 
        if r.ok {
75167672 Andy McCall 698 
            println!(
699 
                "{} {}{}{}",
700 
                ui::done("Pushed"),
701 
                ui::id(format!("{remote}/{}", r.name)),
702 
                ui::sep(),
703 
                ui::dim(if r.reason.is_empty() {
704 
                    "updated"
705 
                } else {
706 
                    r.reason.as_str()
707 
                })
708 
            );
fce44ae9 Andy McCall ↶ 709 
        } else {
75167672 Andy McCall 710 
            println!(
711 
                "{} {} {}{}{}",
712 
                ui::err(ui::glyph("✖", "x")),
713 
                ui::err("Rejected"),
714 
                ui::id(format!("{remote}/{}", r.name)),
715 
                ui::sep(),
716 
                r.reason
717 
            );
fce44ae9 Andy McCall ↶ 718 
            code = 1;
719 
        }
720 
    }
721 
    Ok(code)
722 
}
723
75167672 Andy McCall 724 
pub fn serve(
725 
    root: PathBuf,
726 
    bind: &str,
727 
    tokens: Vec<String>,
728 
    tls: Option<(PathBuf, PathBuf)>,
729 
) -> Result<i32> {
fce44ae9 Andy McCall ↶ 730 
    let listener = std::net::TcpListener::bind(bind).with_context(|| format!("binding {bind}"))?;
544d0541 Andy McCall ↶ 731 
    let root = oxy_core::portable::canonical(&root)?;
2b5ee371 Andy McCall ↶ 732 
    let tls = tls.map(|(cert, key)| oxy_server::TlsFiles { cert, key });
fce44ae9 Andy McCall ↶ 733 
    println!(
2b5ee371 Andy McCall ↶ 734 
        "Serving repositories under {} on {}://{bind}/<repo>/oxy/v1/ ({})",
fce44ae9 Andy McCall ↶ 735 
        root.display(),
2b5ee371 Andy McCall ↶ 736 
        if tls.is_some() { "https" } else { "http" },
75167672 Andy McCall 737 
        if tokens.is_empty() {
738 
            "open: no push tokens configured"
739 
        } else {
740 
            "push requires a token"
741 
        }
fce44ae9 Andy McCall ↶ 742 
    );
75167672 Andy McCall 743 
    if tls.is_none()
744 
        && !bind.starts_with("127.")
745 
        && !bind.starts_with("localhost")
746 
        && !bind.starts_with("[::1]")
747 
    {
2b5ee371 Andy McCall ↶ 748 
        eprintln!("warning: serving plain HTTP on a non-loopback address; put a TLS terminator in front or pass --tls-cert/--tls-key");
749 
    }
750 
    oxy_server::run_blocking(listener, oxy_server::ServerConfig { root, tokens, tls })?;
fce44ae9 Andy McCall ↶ 751 
    Ok(0)
752 
}
79ab8528 Andy McCall ↶ 753
30ea9c1e Andy McCall ↶ 754 
pub fn git_export(git_dir: &std::path::Path, branch: Option<&str>) -> Result<i32> {
79ab8528 Andy McCall ↶ 755 
    let repo = open()?;
135212de Andy McCall ↶ 756 
    let sp = ui::spinner("Exporting to Git…");
30ea9c1e Andy McCall ↶ 757 
    let r = match branch {
758 
        Some(b) => repo.git_export_as(git_dir, b)?,
759 
        None => repo.git_export(git_dir)?,
760 
    };
135212de Andy McCall ↶ 761 
    sp.clear();
79ab8528 Andy McCall ↶ 762 
    println!(
94084087 Andy McCall ↶ 763 
        "{} {} to {} as branch {} {}",
764 
        ui::done("Exported"),
e8b4e156 Andy McCall ↶ 765 
        plural(r.exported, "new state"),
94084087 Andy McCall ↶ 766 
        ui::path(git_dir.display()),
767 
        ui::bookmark(&r.branch),
75167672 Andy McCall 768 
        ui::dim(format!(
769 
            "(currently {}; {} already exported)",
770 
            plural(r.heads, "head"),
771 
            r.skipped
772 
        ))
79ab8528 Andy McCall ↶ 773 
    );
774 
    Ok(0)
775 
}
c3069537 Andy McCall ↶ 776
54e2e630 Andy McCall ↶ 777 
pub fn git_recover() -> Result<i32> {
778 
    let repo = open()?;
779 
    let sp = ui::spinner("Reading the store…");
780 
    let (changes, heads) = repo.recover_git_import(&|m| sp.set(m))?;
781 
    sp.done(&format!(
782 
        "{} {} from imported Git commits: {} now has {}",
783 
        ui::done("Recovered"),
784 
        plural(changes, "change"),
785 
        ui::bookmark(&repo.config.bookmark),
786 
        plural(heads, "head")
787 
    ));
788 
    println!(
789 
        "  {} {}",
790 
        ui::note(),
791 
        ui::dim("carry on with oxy git fetch GIT_DIR --branch BRANCH")
792 
    );
793 
    Ok(0)
794 
}
795
d6e0d5b8 Andy McCall ↶ 796 
/// `--claim` (oxygen#97): record `git.claim`, so this import and every
797 
/// later fetch author the identity's own commits with its key.
798 
fn claim_commits(repo: &mut Repo) -> Result<()> {
799 
    repo.config.set("git.claim", "true")?;
800 
    repo.save_config()?;
801 
    Ok(())
802 
}
803
804 
pub fn git_fetch(url: &str, branch: &str, claim: bool) -> Result<i32> {
805 
    let mut repo = open()?;
806 
    if claim {
807 
        claim_commits(&mut repo)?;
808 
    }
30ea9c1e Andy McCall ↶ 809 
    let sp = ui::spinner(&format!("Fetching {url} {branch}…"));
810 
    let r = repo.git_fetch(url, branch)?;
811 
    sp.clear();
812 
    if r.commits == 0 {
75167672 Andy McCall 813 
        println!(
814 
            "{} {}",
815 
            ui::done("Fetched"),
816 
            ui::dim(format!("nothing new from {url} {branch}"))
817 
        );
30ea9c1e Andy McCall ↶ 818 
    } else {
819 
        println!(
820 
            "{} {} ({} merges) from {} {}{}{} now has {}",
821 
            ui::done("Fetched"),
822 
            plural(r.commits, "new commit"),
823 
            r.merges,
824 
            ui::path(url),
825 
            ui::bookmark(branch),
826 
            ui::sep(),
827 
            ui::bookmark(&repo.config.bookmark),
828 
            plural(r.heads, "head")
829 
        );
830 
        if !repo.snapshot("oxy git fetch")?.changed {
831 
            println!("  {} {}", ui::note(), ui::dim("working copy updated"));
832 
        } else {
75167672 Andy McCall 833 
            println!(
834 
                "  {} {}",
835 
                ui::note(),
836 
                ui::dim("run oxy checkout to update the working copy")
837 
            );
30ea9c1e Andy McCall ↶ 838 
        }
839 
    }
4dee277c Andy McCall ↶ 840 
    if r.submodules > 0 {
75167672 Andy McCall 841 
        println!(
842 
            "  {} {}",
843 
            ui::note(),
844 
            ui::dim(format!(
845 
                "{} submodule {} imported as subrepos with Git pins",
846 
                r.submodules,
847 
                if r.submodules == 1 {
848 
                    "entry"
849 
                } else {
850 
                    "entries"
851 
                }
852 
            ))
853 
        );
30ea9c1e Andy McCall ↶ 854 
    }
855 
    Ok(0)
856 
}
857
858 
pub fn git_push(url: &str, branch: &str) -> Result<i32> {
859 
    let repo = open()?;
860 
    let sp = ui::spinner(&format!("Pushing to {url} {branch}…"));
861 
    let r = repo.git_push(url, branch)?;
862 
    sp.clear();
863 
    println!(
864 
        "{} {} to {} {} {}",
865 
        ui::done("Pushed"),
866 
        plural(r.exported, "new commit"),
867 
        ui::path(url),
868 
        ui::bookmark(&r.branch),
869 
        ui::dim(format!("({} already there)", r.skipped))
870 
    );
871 
    Ok(0)
872 
}
873
62794ecc Andy McCall ↶ 874 
/// `oxy git verify`: exit 1 if any commit's tree is not reproduced.
875 
pub fn git_verify(git_dir: &std::path::Path, branch: &str) -> Result<i32> {
876 
    let repo = open()?;
877 
    let started = std::time::Instant::now();
878 
    let sp = ui::spinner(&format!(
879 
        "Rebuilding every commit of {} {branch}…",
880 
        git_dir.display()
881 
    ));
882 
    let r = repo.verify_git_import(git_dir, branch)?;
883 
    sp.clear();
884 
    for (_, what) in &r.mismatches {
885 
        println!("{} {what}", ui::err(ui::glyph("✖", "x")));
886 
    }
887 
    if r.mismatches.is_empty() {
888 
        println!(
889 
            "{}",
890 
            ui::done(format!(
891 
                "Every commit reproduced: {} commits, {} files compared, in {:.1}s",
892 
                r.commits,
893 
                r.files_compared,
894 
                started.elapsed().as_secs_f64()
895 
            ))
896 
        );
897 
        Ok(0)
898 
    } else {
899 
        println!(
900 
            "{} differences in {} commits checked",
901 
            r.mismatches.len(),
902 
            r.commits
903 
        );
904 
        Ok(1)
905 
    }
906 
}
907
d6e0d5b8 Andy McCall ↶ 908 
pub fn git_import(
909 
    git_dir: &std::path::Path,
910 
    dest: &std::path::Path,
911 
    branch: &str,
912 
    claim: bool,
913 
) -> Result<i32> {
914 
    let mut repo = Repo::init(dest)?;
915 
    if claim {
916 
        claim_commits(&mut repo)?;
917 
    }
c3069537 Andy McCall ↶ 918 
    let started = std::time::Instant::now();
135212de Andy McCall ↶ 919 
    let sp = ui::spinner(&format!("Importing {} {branch}…", git_dir.display()));
58dfe0e1 Andy McCall ↶ 920 
    let r = repo.import_git_with(git_dir, branch, &mut |where_| sp.set(where_))?;
135212de Andy McCall ↶ 921 
    sp.clear();
c3069537 Andy McCall ↶ 922 
    println!(
94084087 Andy McCall ↶ 923 
        "{} {} ({} merges) from {} {} into {} {}",
924 
        ui::done("Imported"),
c3069537 Andy McCall ↶ 925 
        plural(r.commits, "commit"),
926 
        r.merges,
94084087 Andy McCall ↶ 927 
        ui::path(git_dir.display()),
928 
        ui::bookmark(branch),
929 
        ui::path(repo.root().display()),
75167672 Andy McCall 930 
        ui::dim(format!(
931 
            "in {:.1?}; {} now has {}",
932 
            started.elapsed(),
933 
            repo.config.bookmark,
934 
            plural(r.heads, "head")
935 
        ))
c3069537 Andy McCall ↶ 936 
    );
4dee277c Andy McCall ↶ 937 
    if r.submodules > 0 {
75167672 Andy McCall 938 
        println!(
939 
            "  {} {}",
940 
            ui::note(),
941 
            ui::dim(format!(
942 
                "{} submodule {} imported as subrepos with Git pins",
943 
                r.submodules,
944 
                if r.submodules == 1 {
945 
                    "entry"
946 
                } else {
947 
                    "entries"
948 
                }
949 
            ))
950 
        );
4dee277c Andy McCall ↶ 951 
    }
952 
    Ok(0)
953 
}
954
955 
pub fn submodule_add(url: &str, path: &str, bookmark: Option<&str>) -> Result<i32> {
956 
    let repo = open()?;
957 
    let sp = ui::spinner(&format!("Cloning {url} into {path}…"));
958 
    let pin = repo.submodule_add(url, path, bookmark)?;
75167672 Andy McCall 959 
    sp.done(&format!(
960 
        "{} subrepo {} {} {}",
961 
        ui::done("Added"),
962 
        ui::path(path),
963 
        ui::dim(ui::glyph("→", "->")),
964 
        ui::dim(pin.summary())
965 
    ));
966 
    println!(
967 
        "  {} {}",
968 
        ui::note(),
969 
        ui::dim("recorded in .oxymodules; commit to pin it")
970 
    );
4dee277c Andy McCall ↶ 971 
    Ok(0)
972 
}
973
974 
pub fn submodule_update(init: bool, paths: &[String]) -> Result<i32> {
975 
    let repo = open()?;
976 
    let sp = ui::spinner("Updating subrepos…");
977 
    let results = repo.submodule_update(init, paths)?;
7993d465 Andy McCall ↶ 978 
    let unpinned: Vec<_> = repo
979 
        .unpinned_modules()?
980 
        .into_iter()
981 
        .filter(|(p, _)| paths.is_empty() || paths.iter().any(|q| q.trim_end_matches('/') == p))
982 
        .collect();
4dee277c Andy McCall ↶ 983 
    sp.clear();
7993d465 Andy McCall ↶ 984 
    if results.is_empty() && unpinned.is_empty() {
985 
        println!("{}", ui::dim("No subrepos."));
986 
    }
987 
    let code = print_subrepo_results(results);
988 
    print_unpinned(&unpinned);
989 
    Ok(if unpinned.is_empty() { code } else { 1 })
14edbaaf Andy McCall ↶ 990 
}
991
7993d465 Andy McCall ↶ 992 
/// `.oxymodules` entries never added: nothing to clone, so say how to add
993 
/// them (oxygen#72).
994 
fn print_unpinned(unpinned: &[(String, oxy_core::subrepo::Module)]) {
995 
    for (path, m) in unpinned {
996 
        let url = if m.url.is_empty() { "<url>" } else { &m.url };
997 
        println!(
998 
            "{} {}",
999 
            ui::warn(format!(
1000 
                "{} in .oxymodules but never added, so no pin",
1001 
                ui::glyph("⚠", "!")
1002 
            )),
1003 
            ui::path(path)
1004 
        );
1005 
        println!(
1006 
            "  {}",
1007 
            ui::dim(format!("add it with: oxy submodule add {url} {path}"))
1008 
        );
1009 
    }
1010 
}
1011
14edbaaf Andy McCall ↶ 1012 
fn print_subrepo_results(results: Vec<(String, oxy_core::repo::SubrepoSync)>) -> i32 {
4dee277c Andy McCall ↶ 1013 
    let mut code = 0;
1014 
    for (path, r) in results {
1015 
        use oxy_core::repo::SubrepoSync::*;
1016 
        let line = match r {
1017 
            Updated => ui::done("Updated"),
1018 
            UpToDate => ui::ok(format!("{} up to date", ui::glyph("✔", "*"))),
1019 
            Missing => {
1020 
                code = 1;
75167672 Andy McCall 1021 
                ui::warn(format!(
1022 
                    "{} missing (pass --init to clone)",
1023 
                    ui::glyph("⚠", "!")
1024 
                ))
4dee277c Andy McCall ↶ 1025 
            }
1026 
            Dirty => {
1027 
                code = 1;
75167672 Andy McCall 1028 
                ui::warn(format!(
1029 
                    "{} has uncommitted changes; left as is",
1030 
                    ui::glyph("⚠", "!")
1031 
                ))
4dee277c Andy McCall ↶ 1032 
            }
1a3b6203 Andy McCall ↶ 1033 
            KeptBookmark { bookmark, newer } => ui::warn(format!(
1034 
                "{} checked out at the pin; its bookmark {bookmark} keeps {} the pin lacks",
1035 
                ui::glyph("⚠", "!"),
1036 
                plural(newer, "newer change")
1037 
            )),
4dee277c Andy McCall ↶ 1038 
            Failed(e) => {
1039 
                code = 1;
1040 
                ui::err(format!("{} {e}", ui::glyph("✖", "x")))
1041 
            }
1042 
        };
1043 
        println!("{line} {}", ui::path(path));
1044 
    }
14edbaaf Andy McCall ↶ 1045 
    code
4dee277c Andy McCall ↶ 1046 
}
1047
c6aa5bd9 Andy McCall ↶ 1048 
fn pin_json(p: &oxy_core::subrepo::Pin) -> String {
1049 
    match p {
75167672 Andy McCall 1050 
        oxy_core::subrepo::Pin::Oxy {
1051 
            repo,
1052 
            heads,
1053 
            bookmark,
1054 
        } => json::obj([
1055 
            ("kind", json::s("oxy")),
1056 
            (
1057 
                "repo",
1058 
                json::s(&repo.iter().map(|b| format!("{b:02x}")).collect::<String>()),
1059 
            ),
1060 
            ("heads", json::hashes(heads)),
1061 
            ("bookmark", json::s(bookmark)),
1062 
        ]),
1063 
        oxy_core::subrepo::Pin::Git { sha, branch } => json::obj([
1064 
            ("kind", json::s("git")),
1065 
            ("sha", json::s(sha)),
1066 
            ("branch", json::s(branch)),
1067 
        ]),
c6aa5bd9 Andy McCall ↶ 1068 
    }
1069 
}
1070
1071 
pub fn submodule_status(as_json: bool) -> Result<i32> {
4dee277c Andy McCall ↶ 1072 
    let repo = open()?;
1073 
    let subs = repo.subrepos()?;
7993d465 Andy McCall ↶ 1074 
    let unpinned = repo.unpinned_modules()?;
c6aa5bd9 Andy McCall ↶ 1075 
    if as_json {
7993d465 Andy McCall ↶ 1076 
        let pinned = subs.iter().map(|s| {
1077 
            json::obj([
1078 
                ("path", json::s(&s.path)),
1079 
                ("pin", pin_json(&s.pin)),
1080 
                ("actual", json::opt(s.actual.as_ref(), pin_json)),
1081 
                ("at_pin", json::b(s.actual.as_ref() == Some(&s.pin))),
1082 
                ("dirty", json::b(s.dirty)),
1083 
                ("committed", json::b(s.committed)),
1084 
                ("url", json::opt(s.url.as_deref(), json::s)),
1085 
            ])
1086 
        });
1087 
        // Listed in .oxymodules but never added: no pin at all.
1088 
        let unpinned_json = unpinned.iter().map(|(path, m)| {
1089 
            json::obj([
1090 
                ("path", json::s(path)),
1091 
                ("pin", "null".to_string()),
1092 
                ("actual", "null".to_string()),
1093 
                ("at_pin", json::b(false)),
1094 
                ("dirty", json::b(false)),
1095 
                ("committed", json::b(false)),
1096 
                ("url", json::s(&m.url)),
1097 
            ])
1098 
        });
1099 
        println!("{}", json::arr(pinned.chain(unpinned_json)));
c6aa5bd9 Andy McCall ↶ 1100 
        return Ok(0);
1101 
    }
7993d465 Andy McCall ↶ 1102 
    if subs.is_empty() && unpinned.is_empty() {
4dee277c Andy McCall ↶ 1103 
        println!("{}", ui::dim("No subrepos."));
94084087 Andy McCall ↶ 1104 
    }
4dee277c Andy McCall ↶ 1105 
    for s in subs {
1106 
        let state = match (&s.actual, s.dirty) {
e7ac6c2e Andy McCall ↶ 1107 
            _ if !s.committed => {
1108 
                ui::warn(format!("{} added, not committed yet", ui::glyph("+", "+")))
1109 
            }
4dee277c Andy McCall ↶ 1110 
            (None, _) => ui::warn(format!("{} missing", ui::glyph("⚠", "!"))),
1111 
            (Some(a), dirty) if *a == s.pin => {
75167672 Andy McCall 1112 
                if dirty {
1113 
                    ui::warn(format!(
1114 
                        "{} at pin, uncommitted changes",
1115 
                        ui::glyph("✎", "~")
1116 
                    ))
1117 
                } else {
1118 
                    ui::ok(format!("{} at pin", ui::glyph("✔", "*")))
1119 
                }
4dee277c Andy McCall ↶ 1120 
            }
1121 
            (Some(a), _) => ui::warn(format!("{} at {}", ui::glyph("↕", "<>"), a.summary())),
1122 
        };
75167672 Andy McCall 1123 
        println!(
1124 
            "{} {}{}{}{}{state}",
1125 
            ui::ok(ui::glyph("⧉", "#")),
1126 
            ui::path(&s.path),
1127 
            ui::sep(),
1128 
            ui::dim(s.pin.summary()),
1129 
            ui::sep()
1130 
        );
4dee277c Andy McCall ↶ 1131 
        if let Some(u) = s.url {
1132 
            println!("    {} {}", ui::dim(ui::glyph("↳", "->")), ui::dim(u));
1133 
        }
1134 
    }
7993d465 Andy McCall ↶ 1135 
    print_unpinned(&unpinned);
4dee277c Andy McCall ↶ 1136 
    Ok(0)
1137 
}
1138
1139 
pub fn submodule_remove(path: &str) -> Result<i32> {
1140 
    let repo = open()?;
1141 
    repo.submodule_remove(path)?;
75167672 Andy McCall 1142 
    println!(
1143 
        "{} subrepo {} {}",
1144 
        ui::done("Removed"),
1145 
        ui::path(path),
1146 
        ui::dim("(directory left in place; commit to record the removal)")
1147 
    );
c3069537 Andy McCall ↶ 1148 
    Ok(0)
1149 
}
2863456a Andy McCall ↶ 1150
1151 
pub fn deepen(remote: &str, depth: u32) -> Result<i32> {
1152 
    let repo = open()?;
1153 
    if !repo.is_shallow() {
75167672 Andy McCall 1154 
        println!(
1155 
            "{}",
1156 
            ui::dim("This repository is not shallow; nothing to deepen.")
1157 
        );
2863456a Andy McCall ↶ 1158 
        return Ok(0);
1159 
    }
1160 
    let sp = ui::spinner(&format!("Fetching {depth} more levels from {remote}…"));
1161 
    let n = repo.deepen(remote, depth)?;
75167672 Andy McCall 1162 
    sp.done(&format!(
1163 
        "{} {}; {}",
c07406bc Andy McCall ↶ 1164 
        ui::done("Deepened by"),
75167672 Andy McCall 1165 
        plural(n, "change"),
1166 
        if repo.is_shallow() {
1167 
            "still shallow".to_string()
1168 
        } else {
1169 
            ui::ok("history is now complete")
1170 
        }
1171 
    ));
2863456a Andy McCall ↶ 1172 
    Ok(0)
569802eb Andy McCall ↶ 1173 
}
1174
1175 
/// `r`, with a note when the remote's own token was refused while another
1176 
/// sign-in for its hub would do (oxygen#155).
1177 
fn noted<T>(repo: &oxy_core::repo::Repo, remote: &str, r: oxy_core::repo::Result<T>) -> Result<T> {
1178 
    r.map_err(|e| {
1179 
        let m = e.to_string();
1180 
        match repo.stale_token_note(remote, &m) {
1181 
            Some(note) => anyhow::anyhow!("{m}\n  note: {note}"),
1182 
            None => e.into(),
1183 
        }
1184 
    })
2863456a Andy McCall ↶ 1185 
}