OXYGENHUB
# aded4110f0bd oxygen / src / cli / sync.rs
38.9 KiB · Rust · last changed oxy git colocate: a .git beside .oxy, kept up to date after every command; .git is never content and never written by checkout (closes #160) 4 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)),
b63fc7a7 Andy McCall ↶ 402 
                (
403 
                    "withdrawn_tags",
404 
                    json::arr(report.withdrawn_tags.iter().map(|n| json::s(n))),
405 
                ),
c6aa5bd9 Andy McCall ↶ 406 
                ("unverified", json::b(report.unverified)),
4b9d0677 Andy McCall ↶ 407 
                (
408 
                    "log_notes",
409 
                    json::arr(report.log_notes.iter().map(|n| json::s(n))),
410 
                ),
d36ba2f7 Andy McCall ↶ 411 
                ("skipped", skipped_json(&report.skipped)),
c6aa5bd9 Andy McCall ↶ 412 
            ])
413 
        );
414 
        return Ok(0);
415 
    }
94084087 Andy McCall ↶ 416 
    if report.refs.is_empty() {
75167672 Andy McCall 417 
        println!(
418 
            "{} {}",
419 
            ui::done("Fetched"),
420 
            ui::dim(format!("nothing new from {remote}"))
421 
        );
94084087 Andy McCall ↶ 422 
    }
83e0677b Andy McCall ↶ 423 
    for (name, heads, n) in &report.refs {
b35df36b Andy McCall ↶ 424 
        // What was fetched, then how the local bookmark stands against it:
425 
        // "up to date" only when the two are the same (oxygen#56).
426 
        let fetched =
427 
            (*n > 0).then(|| format!("{}{}", ui::ok(plural(*n, "new change")), ui::sep()));
428 
        let them = |k: usize| if k == 1 { "it" } else { "them" };
429 
        let standing = match repo.tracking(&remote, name).ok().flatten() {
430 
            None => ui::dim(format!("no local bookmark {name}")),
431 
            Some((0, 0)) => ui::dim(format!("{name} up to date")),
432 
            Some((0, b)) if *name == repo.config.bookmark => ui::warn(format!(
433 
                "{name} is {} behind: oxy pull to take {}",
434 
                plural(b, "change"),
435 
                them(b)
436 
            )),
437 
            Some((0, b)) => ui::warn(format!(
438 
                "{name} is {} behind: oxy bookmark switch {name} then oxy pull to take {}",
439 
                plural(b, "change"),
440 
                them(b)
441 
            )),
442 
            Some((a, 0)) => ui::dim(format!(
443 
                "{name} is {} ahead: oxy push to send {}",
444 
                plural(a, "change"),
445 
                them(a)
446 
            )),
447 
            Some((a, b)) => ui::warn(format!(
448 
                "{name} and {remote}/{name} have diverged ({a} here, {b} there): oxy pull to merge them"
449 
            )),
75167672 Andy McCall 450 
        };
b35df36b Andy McCall ↶ 451 
        let what = format!("{}{standing}", fetched.unwrap_or_default());
75167672 Andy McCall 452 
        println!(
453 
            "{} {}{}{}{}{what}",
454 
            ui::done("Fetched"),
455 
            ui::id(format!("{remote}/{name}")),
456 
            ui::sep(),
457 
            ui::dim(plural(heads.len(), "head")),
458 
            ui::sep()
459 
        );
83e0677b Andy McCall ↶ 460 
    }
132b884b Andy McCall ↶ 461 
    if report.new_tags > 0 {
75167672 Andy McCall 462 
        println!(
463 
            "  {} {}",
464 
            ui::note(),
465 
            ui::dim(format!("{} adopted", plural(report.new_tags, "tag")))
466 
        );
132b884b Andy McCall ↶ 467 
    }
b63fc7a7 Andy McCall ↶ 468 
    for t in &report.withdrawn_tags {
469 
        println!(
470 
            "  {} {}",
471 
            ui::note(),
472 
            ui::dim(format!("tag {t} was withdrawn on {remote}, and here"))
473 
        );
474 
    }
83e0677b Andy McCall ↶ 475 
    if report.unverified {
75167672 Andy McCall 476 
        eprintln!(
477 
            "{} {remote} has no trust policy; nothing fetched from it was verified",
478 
            ui::caution()
479 
        );
4b9d0677 Andy McCall ↶ 480 
    }
481 
    for n in &report.log_notes {
482 
        eprintln!("{} {n}", ui::caution());
fce44ae9 Andy McCall ↶ 483 
    }
d36ba2f7 Andy McCall ↶ 484 
    warn_skipped(&report.skipped);
fce44ae9 Andy McCall ↶ 485 
    Ok(0)
d36ba2f7 Andy McCall ↶ 486 
}
487
488 
/// Bookmarks a fetch left as they were, their attestation unverifiable
489 
/// (oxygenhub#266): one warning each, naming it and why.
490 
fn warn_skipped(skipped: &[(String, String)]) {
491 
    for (name, why) in skipped {
492 
        eprintln!(
493 
            "{} {} {}",
494 
            ui::caution(),
495 
            ui::warn(format!("{name} not updated:")),
496 
            ui::dim(why)
497 
        );
498 
    }
499 
}
500
501 
fn skipped_json(skipped: &[(String, String)]) -> String {
502 
    json::arr(
503 
        skipped
504 
            .iter()
505 
            .map(|(name, why)| json::obj([("name", json::s(name)), ("reason", json::s(why))])),
506 
    )
fce44ae9 Andy McCall ↶ 507 
}
508
7d9dab13 Andy McCall ↶ 509 
/// Pull acts on the current bookmark only: name the others the fetch
510 
/// found behind their remote, which is easy to take for the current one
511 
/// (oxygen#29).
512 
fn others_behind(repo: &oxy_core::repo::Repo, remote: &str) {
513 
    let Ok(bookmarks) = repo.bookmarks() else {
514 
        return;
515 
    };
516 
    for b in bookmarks {
517 
        let Some(n) = b.behind.filter(|n| *n > 0) else {
518 
            continue;
519 
        };
520 
        if b.current {
521 
            continue;
522 
        }
523 
        println!(
524 
            "  {} {}",
525 
            ui::note(),
526 
            ui::dim(format!(
527 
                "{} is {} behind {remote}/{}: oxy bookmark switch {} then oxy pull to take {}",
528 
                b.name,
529 
                plural(n, "change"),
530 
                b.name,
531 
                b.name,
532 
                if n == 1 { "it" } else { "them" }
533 
            ))
534 
        );
535 
    }
536 
}
537
c6aa5bd9 Andy McCall ↶ 538 
pub fn pull(remote: Option<&str>, as_json: bool) -> Result<i32> {
fce44ae9 Andy McCall ↶ 539 
    let repo = open()?;
b35df36b Andy McCall ↶ 540 
    let remote = remote_name(&repo, remote);
135212de Andy McCall ↶ 541 
    let sp = ui::spinner(&format!("Pulling from {remote}…"));
569802eb Andy McCall ↶ 542 
    let r = noted(&repo, &remote, repo.pull(&remote))?;
c6aa5bd9 Andy McCall ↶ 543 
    if as_json {
544 
        sp.clear();
cc7a0056 Andy McCall ↶ 545 
        let conflicted = repo
546 
            .snapshot_status("oxy pull")?
547 
            .base_snapshot
548 
            .is_conflicted();
75167672 Andy McCall 549 
        println!(
550 
            "{}",
551 
            json::obj([
552 
                ("remote", json::s(&remote)),
7d9dab13 Andy McCall ↶ 553 
                ("bookmark", json::s(&repo.config.bookmark)),
75167672 Andy McCall 554 
                ("heads", json::hashes(&r.heads)),
555 
                ("changed", json::b(r.changed)),
556 
                ("checked_out", json::b(r.checked_out)),
14edbaaf Andy McCall ↶ 557 
                ("conflicted", json::b(conflicted)),
d36ba2f7 Andy McCall ↶ 558 
                ("others", json::arr(r.others.iter().map(|o| json::s(o)))),
559 
                ("skipped", skipped_json(&r.skipped))
75167672 Andy McCall 560 
            ])
561 
        );
c6aa5bd9 Andy McCall ↶ 562 
        return Ok(0);
563 
    }
fce44ae9 Andy McCall ↶ 564 
    if !r.changed {
75167672 Andy McCall 565 
        sp.done(&format!(
f6dccc45 Andy McCall ↶ 566 
            "{} {}{}",
75167672 Andy McCall 567 
            ui::ok(ui::glyph("✔", "*")),
7d9dab13 Andy McCall ↶ 568 
            ui::dim(format!(
569 
                "{} is up to date with {remote}.",
570 
                repo.config.bookmark
f6dccc45 Andy McCall ↶ 571 
            )),
572 
            if r.checked_out {
573 
                ui::dim(" The working copy had fallen behind it and is updated.")
574 
            } else {
575 
                String::new()
576 
            }
75167672 Andy McCall 577 
        ));
14edbaaf Andy McCall ↶ 578 
        others_pulled(&r.others);
7d9dab13 Andy McCall ↶ 579 
        others_behind(&repo, &remote);
d36ba2f7 Andy McCall ↶ 580 
        warn_skipped(&r.skipped);
f6dccc45 Andy McCall ↶ 581 
        if r.checked_out {
582 
            super::workspace::where_now(&repo);
583 
        }
fce44ae9 Andy McCall ↶ 584 
        return Ok(0);
585 
    }
135212de Andy McCall ↶ 586 
    sp.done(&format!(
587 
        "{} {} now has {}{}",
94084087 Andy McCall ↶ 588 
        ui::done("Pulled:"),
589 
        ui::bookmark(&repo.config.bookmark),
fce44ae9 Andy McCall ↶ 590 
        plural(r.heads.len(), "head"),
75167672 Andy McCall 591 
        ui::dim(if r.checked_out {
592 
            "; working copy updated"
593 
        } else {
594 
            "; run oxy checkout to update the working copy"
595 
        })
135212de Andy McCall ↶ 596 
    ));
fce44ae9 Andy McCall ↶ 597 
    let snap = repo.snapshot("oxy pull")?;
598 
    if snap.base_snapshot.is_conflicted() {
75167672 Andy McCall 599 
        println!(
600 
            "  {} {}",
601 
            ui::caution(),
602 
            ui::warn("the result has conflicts; see oxy status")
603 
        );
fce44ae9 Andy McCall ↶ 604 
    }
14edbaaf Andy McCall ↶ 605 
    others_pulled(&r.others);
7d9dab13 Andy McCall ↶ 606 
    others_behind(&repo, &remote);
d36ba2f7 Andy McCall ↶ 607 
    warn_skipped(&r.skipped);
14edbaaf Andy McCall ↶ 608 
    subrepos_behind(&repo);
98a1620a Andy McCall ↶ 609 
    super::workspace::where_now(&repo);
fce44ae9 Andy McCall ↶ 610 
    Ok(0)
611 
}
612
14edbaaf Andy McCall ↶ 613 
/// The other bookmarks a pull moved.
614 
fn others_pulled(others: &[String]) {
615 
    if others.is_empty() {
616 
        return;
617 
    }
618 
    let shown: Vec<String> = others.iter().take(8).map(ui::bookmark).collect();
619 
    let more = others.len().saturating_sub(8);
620 
    println!(
621 
        "  {} {}{}",
622 
        ui::done("Also updated"),
623 
        shown.join(", "),
624 
        if more > 0 {
625 
            ui::dim(format!(" and {more} more"))
626 
        } else {
627 
            String::new()
628 
        }
629 
    );
630 
}
631
f8c69576 Andy McCall ↶ 632 
/// `oxy push [REMOTE] --delete NAME`.
633 
pub fn push_delete(remote: Option<&str>, name: &str, as_json: bool) -> Result<i32> {
634 
    let repo = open()?;
b35df36b Andy McCall ↶ 635 
    let remote = remote_name(&repo, remote);
f8c69576 Andy McCall ↶ 636 
    let sp = ui::spinner(&format!("Deleting {remote}/{name}…"));
637 
    let results = repo.push_delete(&remote, name)?;
638 
    sp.clear();
639 
    if as_json {
640 
        println!(
641 
            "{}",
642 
            json::arr(results.iter().map(|r| {
643 
                json::obj([
644 
                    ("name", json::s(&r.name)),
645 
                    ("ok", json::b(r.ok)),
646 
                    ("reason", json::s(&r.reason)),
647 
                    ("state", json::s("")),
648 
                ])
649 
            }))
650 
        );
651 
        return Ok(if results.iter().all(|r| r.ok) { 0 } else { 1 });
652 
    }
653 
    let mut code = 0;
654 
    for r in results {
655 
        if r.ok {
b63fc7a7 Andy McCall ↶ 656 
            let done = if r.name.starts_with("tags/") {
657 
                "Withdrew"
658 
            } else {
659 
                "Deleted"
660 
            };
f8c69576 Andy McCall ↶ 661 
            println!(
662 
                "{} {}",
b63fc7a7 Andy McCall ↶ 663 
                ui::done(done),
f8c69576 Andy McCall ↶ 664 
                ui::id(format!("{remote}/{}", r.name))
665 
            );
666 
        } else {
667 
            println!(
668 
                "{} {} {}{}{}",
669 
                ui::err(ui::glyph("✖", "x")),
670 
                ui::err("Rejected"),
671 
                ui::id(format!("{remote}/{}", r.name)),
672 
                ui::sep(),
673 
                r.reason
674 
            );
675 
            code = 1;
676 
        }
677 
    }
678 
    Ok(code)
679 
}
680
75167672 Andy McCall 681 
pub fn push(
682 
    remote: Option<&str>,
683 
    force: bool,
684 
    bookmark: Option<&str>,
685 
    as_json: bool,
686 
) -> Result<i32> {
fce44ae9 Andy McCall ↶ 687 
    let repo = open()?;
b35df36b Andy McCall ↶ 688 
    let remote = remote_name(&repo, remote);
135212de Andy McCall ↶ 689 
    let sp = ui::spinner(&format!("Pushing to {remote}…"));
cb8b8082 Andy McCall ↶ 690 
    let bookmark_name = bookmark.map_or_else(|| repo.config.bookmark.clone(), String::from);
691 
    // A long push goes in parts: the spinner says which.
569802eb Andy McCall ↶ 692 
    let results = noted(
693 
        &repo,
694 
        &remote,
695 
        repo.push_bookmark_with(&remote, &bookmark_name, force, &mut |m| {
696 
            sp.set(&format!("Pushing to {remote}… {m}"))
697 
        }),
698 
    )?;
135212de Andy McCall ↶ 699 
    sp.clear();
c6aa5bd9 Andy McCall ↶ 700 
    if as_json {
75167672 Andy McCall 701 
        println!(
702 
            "{}",
703 
            json::arr(results.iter().map(|r| json::obj([
704 
                ("name", json::s(&r.name)),
705 
                ("ok", json::b(r.ok)),
706 
                ("reason", json::s(&r.reason))
707 
            ])))
708 
        );
c6aa5bd9 Andy McCall ↶ 709 
        return Ok(if results.iter().all(|r| r.ok) { 0 } else { 1 });
710 
    }
fce44ae9 Andy McCall ↶ 711 
    let mut code = 0;
135212de Andy McCall ↶ 712 
    for r in results {
fce44ae9 Andy McCall ↶ 713 
        if r.ok {
75167672 Andy McCall 714 
            println!(
715 
                "{} {}{}{}",
716 
                ui::done("Pushed"),
717 
                ui::id(format!("{remote}/{}", r.name)),
718 
                ui::sep(),
719 
                ui::dim(if r.reason.is_empty() {
720 
                    "updated"
721 
                } else {
722 
                    r.reason.as_str()
723 
                })
724 
            );
fce44ae9 Andy McCall ↶ 725 
        } else {
75167672 Andy McCall 726 
            println!(
727 
                "{} {} {}{}{}",
728 
                ui::err(ui::glyph("✖", "x")),
729 
                ui::err("Rejected"),
730 
                ui::id(format!("{remote}/{}", r.name)),
731 
                ui::sep(),
732 
                r.reason
733 
            );
fce44ae9 Andy McCall ↶ 734 
            code = 1;
735 
        }
736 
    }
737 
    Ok(code)
738 
}
739
75167672 Andy McCall 740 
pub fn serve(
741 
    root: PathBuf,
742 
    bind: &str,
743 
    tokens: Vec<String>,
744 
    tls: Option<(PathBuf, PathBuf)>,
745 
) -> Result<i32> {
fce44ae9 Andy McCall ↶ 746 
    let listener = std::net::TcpListener::bind(bind).with_context(|| format!("binding {bind}"))?;
544d0541 Andy McCall ↶ 747 
    let root = oxy_core::portable::canonical(&root)?;
2b5ee371 Andy McCall ↶ 748 
    let tls = tls.map(|(cert, key)| oxy_server::TlsFiles { cert, key });
fce44ae9 Andy McCall ↶ 749 
    println!(
2b5ee371 Andy McCall ↶ 750 
        "Serving repositories under {} on {}://{bind}/<repo>/oxy/v1/ ({})",
fce44ae9 Andy McCall ↶ 751 
        root.display(),
2b5ee371 Andy McCall ↶ 752 
        if tls.is_some() { "https" } else { "http" },
75167672 Andy McCall 753 
        if tokens.is_empty() {
754 
            "open: no push tokens configured"
755 
        } else {
756 
            "push requires a token"
757 
        }
fce44ae9 Andy McCall ↶ 758 
    );
75167672 Andy McCall 759 
    if tls.is_none()
760 
        && !bind.starts_with("127.")
761 
        && !bind.starts_with("localhost")
762 
        && !bind.starts_with("[::1]")
763 
    {
2b5ee371 Andy McCall ↶ 764 
        eprintln!("warning: serving plain HTTP on a non-loopback address; put a TLS terminator in front or pass --tls-cert/--tls-key");
765 
    }
766 
    oxy_server::run_blocking(listener, oxy_server::ServerConfig { root, tokens, tls })?;
fce44ae9 Andy McCall ↶ 767 
    Ok(0)
768 
}
79ab8528 Andy McCall ↶ 769
c397a8c3 Andy McCall ↶ 770 
/// `oxy git colocate [--off]`: keep a `.git` beside `.oxy` (spec §23).
771 
pub fn git_colocate(off: bool) -> Result<i32> {
772 
    let mut repo = open()?;
773 
    if repo.is_bare() {
774 
        anyhow::bail!("a bare repository has no working copy for a .git beside it");
775 
    }
776 
    repo.config
777 
        .set("git.colocate", if off { "false" } else { "true" })?;
778 
    repo.save_config()?;
779 
    if off {
780 
        println!(
781 
            "{} the .git beside this checkout is no longer updated {}",
782 
            ui::done("Stopped:"),
783 
            ui::dim("(it is left as it is: delete .git yourself if you want it gone)")
784 
        );
785 
        return Ok(0);
786 
    }
787 
    let sp = ui::spinner("Exporting to .git…");
788 
    repo.git_colocate_sync()?;
789 
    sp.clear();
790 
    println!(
791 
        "{} .git beside .oxy holds {} {}",
792 
        ui::done("Colocated:"),
793 
        ui::bookmark(&repo.config.bookmark),
794 
        ui::dim("(updated after every oxy command; Git's own commits are not read back: commit with oxy)")
795 
    );
796 
    Ok(0)
797 
}
798
30ea9c1e Andy McCall ↶ 799 
pub fn git_export(git_dir: &std::path::Path, branch: Option<&str>) -> Result<i32> {
79ab8528 Andy McCall ↶ 800 
    let repo = open()?;
135212de Andy McCall ↶ 801 
    let sp = ui::spinner("Exporting to Git…");
30ea9c1e Andy McCall ↶ 802 
    let r = match branch {
803 
        Some(b) => repo.git_export_as(git_dir, b)?,
804 
        None => repo.git_export(git_dir)?,
805 
    };
135212de Andy McCall ↶ 806 
    sp.clear();
79ab8528 Andy McCall ↶ 807 
    println!(
94084087 Andy McCall ↶ 808 
        "{} {} to {} as branch {} {}",
809 
        ui::done("Exported"),
e8b4e156 Andy McCall ↶ 810 
        plural(r.exported, "new state"),
94084087 Andy McCall ↶ 811 
        ui::path(git_dir.display()),
812 
        ui::bookmark(&r.branch),
75167672 Andy McCall 813 
        ui::dim(format!(
814 
            "(currently {}; {} already exported)",
815 
            plural(r.heads, "head"),
816 
            r.skipped
817 
        ))
79ab8528 Andy McCall ↶ 818 
    );
819 
    Ok(0)
820 
}
c3069537 Andy McCall ↶ 821
54e2e630 Andy McCall ↶ 822 
pub fn git_recover() -> Result<i32> {
823 
    let repo = open()?;
824 
    let sp = ui::spinner("Reading the store…");
825 
    let (changes, heads) = repo.recover_git_import(&|m| sp.set(m))?;
826 
    sp.done(&format!(
827 
        "{} {} from imported Git commits: {} now has {}",
828 
        ui::done("Recovered"),
829 
        plural(changes, "change"),
830 
        ui::bookmark(&repo.config.bookmark),
831 
        plural(heads, "head")
832 
    ));
833 
    println!(
834 
        "  {} {}",
835 
        ui::note(),
836 
        ui::dim("carry on with oxy git fetch GIT_DIR --branch BRANCH")
837 
    );
838 
    Ok(0)
839 
}
840
d6e0d5b8 Andy McCall ↶ 841 
/// `--claim` (oxygen#97): record `git.claim`, so this import and every
842 
/// later fetch author the identity's own commits with its key.
843 
fn claim_commits(repo: &mut Repo) -> Result<()> {
844 
    repo.config.set("git.claim", "true")?;
845 
    repo.save_config()?;
846 
    Ok(())
847 
}
848
849 
pub fn git_fetch(url: &str, branch: &str, claim: bool) -> Result<i32> {
850 
    let mut repo = open()?;
851 
    if claim {
852 
        claim_commits(&mut repo)?;
853 
    }
30ea9c1e Andy McCall ↶ 854 
    let sp = ui::spinner(&format!("Fetching {url} {branch}…"));
855 
    let r = repo.git_fetch(url, branch)?;
856 
    sp.clear();
857 
    if r.commits == 0 {
75167672 Andy McCall 858 
        println!(
859 
            "{} {}",
860 
            ui::done("Fetched"),
861 
            ui::dim(format!("nothing new from {url} {branch}"))
862 
        );
30ea9c1e Andy McCall ↶ 863 
    } else {
864 
        println!(
865 
            "{} {} ({} merges) from {} {}{}{} now has {}",
866 
            ui::done("Fetched"),
867 
            plural(r.commits, "new commit"),
868 
            r.merges,
869 
            ui::path(url),
870 
            ui::bookmark(branch),
871 
            ui::sep(),
872 
            ui::bookmark(&repo.config.bookmark),
873 
            plural(r.heads, "head")
874 
        );
875 
        if !repo.snapshot("oxy git fetch")?.changed {
876 
            println!("  {} {}", ui::note(), ui::dim("working copy updated"));
877 
        } else {
75167672 Andy McCall 878 
            println!(
879 
                "  {} {}",
880 
                ui::note(),
881 
                ui::dim("run oxy checkout to update the working copy")
882 
            );
30ea9c1e Andy McCall ↶ 883 
        }
884 
    }
4dee277c Andy McCall ↶ 885 
    if r.submodules > 0 {
75167672 Andy McCall 886 
        println!(
887 
            "  {} {}",
888 
            ui::note(),
889 
            ui::dim(format!(
890 
                "{} submodule {} imported as subrepos with Git pins",
891 
                r.submodules,
892 
                if r.submodules == 1 {
893 
                    "entry"
894 
                } else {
895 
                    "entries"
896 
                }
897 
            ))
898 
        );
30ea9c1e Andy McCall ↶ 899 
    }
900 
    Ok(0)
901 
}
902
903 
pub fn git_push(url: &str, branch: &str) -> Result<i32> {
904 
    let repo = open()?;
905 
    let sp = ui::spinner(&format!("Pushing to {url} {branch}…"));
906 
    let r = repo.git_push(url, branch)?;
907 
    sp.clear();
908 
    println!(
909 
        "{} {} to {} {} {}",
910 
        ui::done("Pushed"),
911 
        plural(r.exported, "new commit"),
912 
        ui::path(url),
913 
        ui::bookmark(&r.branch),
914 
        ui::dim(format!("({} already there)", r.skipped))
915 
    );
916 
    Ok(0)
917 
}
918
62794ecc Andy McCall ↶ 919 
/// `oxy git verify`: exit 1 if any commit's tree is not reproduced.
7eac74ab Andy McCall ↶ 920 
pub fn git_verify(git_dir: &std::path::Path, branch: &str, last: Option<usize>) -> Result<i32> {
62794ecc Andy McCall ↶ 921 
    let repo = open()?;
922 
    let started = std::time::Instant::now();
923 
    let sp = ui::spinner(&format!(
924 
        "Rebuilding every commit of {} {branch}…",
925 
        git_dir.display()
926 
    ));
7eac74ab Andy McCall ↶ 927 
    let r = repo.verify_git_import_last(git_dir, branch, last)?;
62794ecc Andy McCall ↶ 928 
    sp.clear();
929 
    for (_, what) in &r.mismatches {
930 
        println!("{} {what}", ui::err(ui::glyph("✖", "x")));
931 
    }
932 
    if r.mismatches.is_empty() {
933 
        println!(
934 
            "{}",
7eac74ab Andy McCall ↶ 935 
            ui::done(if r.skipped > 0 {
936 
                format!(
937 
                    "The last {} commits reproduced ({} followed), {} files compared, in {:.1}s",
938 
                    r.commits - r.skipped,
939 
                    r.skipped,
940 
                    r.files_compared,
941 
                    started.elapsed().as_secs_f64()
942 
                )
943 
            } else {
944 
                format!(
945 
                    "Every commit reproduced: {} commits, {} files compared, in {:.1}s",
946 
                    r.commits,
947 
                    r.files_compared,
948 
                    started.elapsed().as_secs_f64()
949 
                )
950 
            })
62794ecc Andy McCall ↶ 951 
        );
952 
        Ok(0)
953 
    } else {
954 
        println!(
955 
            "{} differences in {} commits checked",
956 
            r.mismatches.len(),
957 
            r.commits
958 
        );
959 
        Ok(1)
960 
    }
961 
}
962
d6e0d5b8 Andy McCall ↶ 963 
pub fn git_import(
964 
    git_dir: &std::path::Path,
965 
    dest: &std::path::Path,
966 
    branch: &str,
967 
    claim: bool,
968 
) -> Result<i32> {
969 
    let mut repo = Repo::init(dest)?;
970 
    if claim {
971 
        claim_commits(&mut repo)?;
972 
    }
c3069537 Andy McCall ↶ 973 
    let started = std::time::Instant::now();
135212de Andy McCall ↶ 974 
    let sp = ui::spinner(&format!("Importing {} {branch}…", git_dir.display()));
58dfe0e1 Andy McCall ↶ 975 
    let r = repo.import_git_with(git_dir, branch, &mut |where_| sp.set(where_))?;
135212de Andy McCall ↶ 976 
    sp.clear();
c3069537 Andy McCall ↶ 977 
    println!(
94084087 Andy McCall ↶ 978 
        "{} {} ({} merges) from {} {} into {} {}",
979 
        ui::done("Imported"),
c3069537 Andy McCall ↶ 980 
        plural(r.commits, "commit"),
981 
        r.merges,
94084087 Andy McCall ↶ 982 
        ui::path(git_dir.display()),
983 
        ui::bookmark(branch),
984 
        ui::path(repo.root().display()),
75167672 Andy McCall 985 
        ui::dim(format!(
986 
            "in {:.1?}; {} now has {}",
987 
            started.elapsed(),
988 
            repo.config.bookmark,
989 
            plural(r.heads, "head")
990 
        ))
c3069537 Andy McCall ↶ 991 
    );
4dee277c Andy McCall ↶ 992 
    if r.submodules > 0 {
75167672 Andy McCall 993 
        println!(
994 
            "  {} {}",
995 
            ui::note(),
996 
            ui::dim(format!(
997 
                "{} submodule {} imported as subrepos with Git pins",
998 
                r.submodules,
999 
                if r.submodules == 1 {
1000 
                    "entry"
1001 
                } else {
1002 
                    "entries"
1003 
                }
1004 
            ))
1005 
        );
4dee277c Andy McCall ↶ 1006 
    }
1007 
    Ok(0)
1008 
}
1009
1010 
pub fn submodule_add(url: &str, path: &str, bookmark: Option<&str>) -> Result<i32> {
1011 
    let repo = open()?;
1012 
    let sp = ui::spinner(&format!("Cloning {url} into {path}…"));
1013 
    let pin = repo.submodule_add(url, path, bookmark)?;
75167672 Andy McCall 1014 
    sp.done(&format!(
1015 
        "{} subrepo {} {} {}",
1016 
        ui::done("Added"),
1017 
        ui::path(path),
1018 
        ui::dim(ui::glyph("→", "->")),
1019 
        ui::dim(pin.summary())
1020 
    ));
1021 
    println!(
1022 
        "  {} {}",
1023 
        ui::note(),
1024 
        ui::dim("recorded in .oxymodules; commit to pin it")
1025 
    );
4dee277c Andy McCall ↶ 1026 
    Ok(0)
1027 
}
1028
1029 
pub fn submodule_update(init: bool, paths: &[String]) -> Result<i32> {
1030 
    let repo = open()?;
1031 
    let sp = ui::spinner("Updating subrepos…");
1032 
    let results = repo.submodule_update(init, paths)?;
7993d465 Andy McCall ↶ 1033 
    let unpinned: Vec<_> = repo
1034 
        .unpinned_modules()?
1035 
        .into_iter()
1036 
        .filter(|(p, _)| paths.is_empty() || paths.iter().any(|q| q.trim_end_matches('/') == p))
1037 
        .collect();
4dee277c Andy McCall ↶ 1038 
    sp.clear();
7993d465 Andy McCall ↶ 1039 
    if results.is_empty() && unpinned.is_empty() {
1040 
        println!("{}", ui::dim("No subrepos."));
1041 
    }
1042 
    let code = print_subrepo_results(results);
1043 
    print_unpinned(&unpinned);
1044 
    Ok(if unpinned.is_empty() { code } else { 1 })
14edbaaf Andy McCall ↶ 1045 
}
1046
7993d465 Andy McCall ↶ 1047 
/// `.oxymodules` entries never added: nothing to clone, so say how to add
1048 
/// them (oxygen#72).
1049 
fn print_unpinned(unpinned: &[(String, oxy_core::subrepo::Module)]) {
1050 
    for (path, m) in unpinned {
1051 
        let url = if m.url.is_empty() { "<url>" } else { &m.url };
1052 
        println!(
1053 
            "{} {}",
1054 
            ui::warn(format!(
1055 
                "{} in .oxymodules but never added, so no pin",
1056 
                ui::glyph("⚠", "!")
1057 
            )),
1058 
            ui::path(path)
1059 
        );
1060 
        println!(
1061 
            "  {}",
1062 
            ui::dim(format!("add it with: oxy submodule add {url} {path}"))
1063 
        );
1064 
    }
1065 
}
1066
14edbaaf Andy McCall ↶ 1067 
fn print_subrepo_results(results: Vec<(String, oxy_core::repo::SubrepoSync)>) -> i32 {
4dee277c Andy McCall ↶ 1068 
    let mut code = 0;
1069 
    for (path, r) in results {
1070 
        use oxy_core::repo::SubrepoSync::*;
1071 
        let line = match r {
1072 
            Updated => ui::done("Updated"),
1073 
            UpToDate => ui::ok(format!("{} up to date", ui::glyph("✔", "*"))),
1074 
            Missing => {
1075 
                code = 1;
75167672 Andy McCall 1076 
                ui::warn(format!(
1077 
                    "{} missing (pass --init to clone)",
1078 
                    ui::glyph("⚠", "!")
1079 
                ))
4dee277c Andy McCall ↶ 1080 
            }
1081 
            Dirty => {
1082 
                code = 1;
75167672 Andy McCall 1083 
                ui::warn(format!(
1084 
                    "{} has uncommitted changes; left as is",
1085 
                    ui::glyph("⚠", "!")
1086 
                ))
4dee277c Andy McCall ↶ 1087 
            }
1a3b6203 Andy McCall ↶ 1088 
            KeptBookmark { bookmark, newer } => ui::warn(format!(
1089 
                "{} checked out at the pin; its bookmark {bookmark} keeps {} the pin lacks",
1090 
                ui::glyph("⚠", "!"),
1091 
                plural(newer, "newer change")
1092 
            )),
4dee277c Andy McCall ↶ 1093 
            Failed(e) => {
1094 
                code = 1;
1095 
                ui::err(format!("{} {e}", ui::glyph("✖", "x")))
1096 
            }
1097 
        };
1098 
        println!("{line} {}", ui::path(path));
1099 
    }
14edbaaf Andy McCall ↶ 1100 
    code
4dee277c Andy McCall ↶ 1101 
}
1102
c6aa5bd9 Andy McCall ↶ 1103 
fn pin_json(p: &oxy_core::subrepo::Pin) -> String {
1104 
    match p {
75167672 Andy McCall 1105 
        oxy_core::subrepo::Pin::Oxy {
1106 
            repo,
1107 
            heads,
1108 
            bookmark,
1109 
        } => json::obj([
1110 
            ("kind", json::s("oxy")),
1111 
            (
1112 
                "repo",
1113 
                json::s(&repo.iter().map(|b| format!("{b:02x}")).collect::<String>()),
1114 
            ),
1115 
            ("heads", json::hashes(heads)),
1116 
            ("bookmark", json::s(bookmark)),
1117 
        ]),
1118 
        oxy_core::subrepo::Pin::Git { sha, branch } => json::obj([
1119 
            ("kind", json::s("git")),
1120 
            ("sha", json::s(sha)),
1121 
            ("branch", json::s(branch)),
1122 
        ]),
c6aa5bd9 Andy McCall ↶ 1123 
    }
1124 
}
1125
1126 
pub fn submodule_status(as_json: bool) -> Result<i32> {
4dee277c Andy McCall ↶ 1127 
    let repo = open()?;
1128 
    let subs = repo.subrepos()?;
7993d465 Andy McCall ↶ 1129 
    let unpinned = repo.unpinned_modules()?;
c6aa5bd9 Andy McCall ↶ 1130 
    if as_json {
7993d465 Andy McCall ↶ 1131 
        let pinned = subs.iter().map(|s| {
1132 
            json::obj([
1133 
                ("path", json::s(&s.path)),
1134 
                ("pin", pin_json(&s.pin)),
1135 
                ("actual", json::opt(s.actual.as_ref(), pin_json)),
1136 
                ("at_pin", json::b(s.actual.as_ref() == Some(&s.pin))),
1137 
                ("dirty", json::b(s.dirty)),
1138 
                ("committed", json::b(s.committed)),
1139 
                ("url", json::opt(s.url.as_deref(), json::s)),
1140 
            ])
1141 
        });
1142 
        // Listed in .oxymodules but never added: no pin at all.
1143 
        let unpinned_json = unpinned.iter().map(|(path, m)| {
1144 
            json::obj([
1145 
                ("path", json::s(path)),
1146 
                ("pin", "null".to_string()),
1147 
                ("actual", "null".to_string()),
1148 
                ("at_pin", json::b(false)),
1149 
                ("dirty", json::b(false)),
1150 
                ("committed", json::b(false)),
1151 
                ("url", json::s(&m.url)),
1152 
            ])
1153 
        });
1154 
        println!("{}", json::arr(pinned.chain(unpinned_json)));
c6aa5bd9 Andy McCall ↶ 1155 
        return Ok(0);
1156 
    }
7993d465 Andy McCall ↶ 1157 
    if subs.is_empty() && unpinned.is_empty() {
4dee277c Andy McCall ↶ 1158 
        println!("{}", ui::dim("No subrepos."));
94084087 Andy McCall ↶ 1159 
    }
4dee277c Andy McCall ↶ 1160 
    for s in subs {
1161 
        let state = match (&s.actual, s.dirty) {
e7ac6c2e Andy McCall ↶ 1162 
            _ if !s.committed => {
1163 
                ui::warn(format!("{} added, not committed yet", ui::glyph("+", "+")))
1164 
            }
4dee277c Andy McCall ↶ 1165 
            (None, _) => ui::warn(format!("{} missing", ui::glyph("⚠", "!"))),
1166 
            (Some(a), dirty) if *a == s.pin => {
75167672 Andy McCall 1167 
                if dirty {
1168 
                    ui::warn(format!(
1169 
                        "{} at pin, uncommitted changes",
1170 
                        ui::glyph("✎", "~")
1171 
                    ))
1172 
                } else {
1173 
                    ui::ok(format!("{} at pin", ui::glyph("✔", "*")))
1174 
                }
4dee277c Andy McCall ↶ 1175 
            }
1176 
            (Some(a), _) => ui::warn(format!("{} at {}", ui::glyph("↕", "<>"), a.summary())),
1177 
        };
75167672 Andy McCall 1178 
        println!(
1179 
            "{} {}{}{}{}{state}",
1180 
            ui::ok(ui::glyph("⧉", "#")),
1181 
            ui::path(&s.path),
1182 
            ui::sep(),
1183 
            ui::dim(s.pin.summary()),
1184 
            ui::sep()
1185 
        );
4dee277c Andy McCall ↶ 1186 
        if let Some(u) = s.url {
1187 
            println!("    {} {}", ui::dim(ui::glyph("↳", "->")), ui::dim(u));
1188 
        }
1189 
    }
7993d465 Andy McCall ↶ 1190 
    print_unpinned(&unpinned);
4dee277c Andy McCall ↶ 1191 
    Ok(0)
1192 
}
1193
1194 
pub fn submodule_remove(path: &str) -> Result<i32> {
1195 
    let repo = open()?;
1196 
    repo.submodule_remove(path)?;
75167672 Andy McCall 1197 
    println!(
1198 
        "{} subrepo {} {}",
1199 
        ui::done("Removed"),
1200 
        ui::path(path),
1201 
        ui::dim("(directory left in place; commit to record the removal)")
1202 
    );
c3069537 Andy McCall ↶ 1203 
    Ok(0)
1204 
}
2863456a Andy McCall ↶ 1205
1206 
pub fn deepen(remote: &str, depth: u32) -> Result<i32> {
1207 
    let repo = open()?;
1208 
    if !repo.is_shallow() {
75167672 Andy McCall 1209 
        println!(
1210 
            "{}",
1211 
            ui::dim("This repository is not shallow; nothing to deepen.")
1212 
        );
2863456a Andy McCall ↶ 1213 
        return Ok(0);
1214 
    }
1215 
    let sp = ui::spinner(&format!("Fetching {depth} more levels from {remote}…"));
1216 
    let n = repo.deepen(remote, depth)?;
75167672 Andy McCall 1217 
    sp.done(&format!(
1218 
        "{} {}; {}",
c07406bc Andy McCall ↶ 1219 
        ui::done("Deepened by"),
75167672 Andy McCall 1220 
        plural(n, "change"),
1221 
        if repo.is_shallow() {
1222 
            "still shallow".to_string()
1223 
        } else {
1224 
            ui::ok("history is now complete")
1225 
        }
1226 
    ));
2863456a Andy McCall ↶ 1227 
    Ok(0)
569802eb Andy McCall ↶ 1228 
}
1229
1230 
/// `r`, with a note when the remote's own token was refused while another
1231 
/// sign-in for its hub would do (oxygen#155).
1232 
fn noted<T>(repo: &oxy_core::repo::Repo, remote: &str, r: oxy_core::repo::Result<T>) -> Result<T> {
1233 
    r.map_err(|e| {
1234 
        let m = e.to_string();
1235 
        match repo.stale_token_note(remote, &m) {
1236 
            Some(note) => anyhow::anyhow!("{m}\n  note: {note}"),
1237 
            None => e.into(),
1238 
        }
1239 
    })
2863456a Andy McCall ↶ 1240 
}