OXYGENHUB
# 8e1194860efa oxygen / src / cli / sync.rs
9.3 KiB · Rust · last changed Lazy blobs: clone --max-blob / filter.max-blob, absent-blob registry fetched on first read, objects endpoint (spec 0.6e) 1 month ago source blame history raw
fce44ae9 Andy McCall ↶ 1
//! Commands that talk to remotes, and the reference server.
2
3
use super::format::plural;
4
use super::open;
135212de Andy McCall ↶ 5
use super::ui;
fce44ae9 Andy McCall ↶ 6
use anyhow::{Context, Result};
7
use oxy_core::repo::Repo;
8
use std::path::PathBuf;
9
2863456a Andy McCall ↶ 10
pub fn clone(url: &str, dest: Option<PathBuf>, max_blob: Option<&str>, sparse: &[String], depth: Option<u32>) -> Result<i32> {
fce44ae9 Andy McCall ↶ 11
    let dest = dest.unwrap_or_else(|| {
12
        let base = url.trim_end_matches('/').rsplit('/').next().unwrap_or("repo");
13
        PathBuf::from(base)
14
    });
b3c5a59a Andy McCall ↶ 15
    let max_blob = max_blob.map(oxy_core::repo::parse_size).transpose()?;
135212de Andy McCall ↶ 16
    let sp = ui::spinner(&format!("Cloning {url}…"));
2863456a Andy McCall ↶ 17
    let repo = match depth {
18
        Some(d) => Repo::clone_shallow(url, &dest, d, max_blob, sparse)?,
19
        None => Repo::clone_with(url, &dest, max_blob, sparse)?,
20
    };
fce44ae9 Andy McCall ↶ 21
    let heads = repo.bookmark_heads()?;
94084087 Andy McCall ↶ 22
    sp.done(&format!("{} into {} {}", ui::done("Cloned"), ui::path(repo.root().display()), ui::dim(format!("({url}, {} with {})", ui::bookmark(&repo.config.bookmark), plural(heads.len(), "head")))));
fce44ae9 Andy McCall ↶ 23
    Ok(0)
24
}
25
26
pub fn remote_add(name: &str, url: &str) -> Result<i32> {
27
    let mut repo = open()?;
28
    repo.config.set(&format!("remote.{name}.url"), url)?;
29
    repo.save_config()?;
94084087 Andy McCall ↶ 30
    println!("{} remote {} {} {url}", ui::done("Added"), ui::bookmark(name), ui::dim(ui::glyph("→", "->")));
fce44ae9 Andy McCall ↶ 31
    Ok(0)
32
}
33
34
pub fn remote_remove(name: &str) -> Result<i32> {
35
    let mut repo = open()?;
36
    repo.config.set(&format!("remote.{name}.url"), "")?;
37
    repo.save_config()?;
94084087 Andy McCall ↶ 38
    println!("{} remote {}", ui::done("Removed"), ui::bookmark(name));
fce44ae9 Andy McCall ↶ 39
    Ok(0)
40
}
41
42
pub fn remote_list() -> Result<i32> {
43
    let repo = open()?;
44
    let view = repo.view()?;
94084087 Andy McCall ↶ 45
    if repo.config.remotes.is_empty() {
46
        println!("{}", ui::dim("No remotes; add one with oxy remote add <name> <url>."));
47
    }
fce44ae9 Andy McCall ↶ 48
    for (name, url) in &repo.config.remotes {
94084087 Andy McCall ↶ 49
        println!("{} {}{}{}", ui::ok(ui::glyph("⇄", "<>")), ui::bookmark(name), ui::sep(), ui::dim(url));
fce44ae9 Andy McCall ↶ 50
        if let Some(bms) = view.remotes.get(name) {
51
            for (bm, st) in bms {
52
                let heads = repo.store().get_state(st).map(|s| s.heads.len()).unwrap_or(0);
94084087 Andy McCall ↶ 53
                println!("    {} {}{}{}", ui::dim(ui::glyph("↳", "->")), ui::id(format!("{name}/{bm}")), ui::sep(), ui::dim(plural(heads, "head")));
fce44ae9 Andy McCall ↶ 54
            }
55
        }
56
    }
57
    Ok(0)
58
}
59
60
fn remote_name(remote: Option<&str>) -> String {
61
    remote.unwrap_or("origin").to_string()
62
}
63
64
pub fn fetch(remote: Option<&str>) -> Result<i32> {
65
    let repo = open()?;
66
    let remote = remote_name(remote);
135212de Andy McCall ↶ 67
    let sp = ui::spinner(&format!("Fetching from {remote}…"));
83e0677b Andy McCall ↶ 68
    let report = repo.fetch(&remote)?;
135212de Andy McCall ↶ 69
    sp.clear();
94084087 Andy McCall ↶ 70
    if report.refs.is_empty() {
71
        println!("{} {}", ui::done("Fetched"), ui::dim(format!("nothing new from {remote}")));
72
    }
83e0677b Andy McCall ↶ 73
    for (name, heads, n) in &report.refs {
94084087 Andy McCall ↶ 74
        let what = if *n == 0 { ui::dim("up to date") } else { ui::ok(plural(*n, "new change")) };
75
        println!("{} {}{}{}{}{what}", ui::done("Fetched"), ui::id(format!("{remote}/{name}")), ui::sep(), ui::dim(plural(heads.len(), "head")), ui::sep());
83e0677b Andy McCall ↶ 76
    }
132b884b Andy McCall ↶ 77
    if report.new_tags > 0 {
94084087 Andy McCall ↶ 78
        println!("  {} {}", ui::note(), ui::dim(format!("{} adopted", plural(report.new_tags, "tag"))));
132b884b Andy McCall ↶ 79
    }
83e0677b Andy McCall ↶ 80
    if report.unverified {
94084087 Andy McCall ↶ 81
        eprintln!("{} {remote} has no trust policy; nothing fetched from it was verified", ui::caution());
fce44ae9 Andy McCall ↶ 82
    }
83
    Ok(0)
84
}
85
86
pub fn pull(remote: Option<&str>) -> Result<i32> {
87
    let repo = open()?;
88
    let remote = remote_name(remote);
135212de Andy McCall ↶ 89
    let sp = ui::spinner(&format!("Pulling from {remote}…"));
fce44ae9 Andy McCall ↶ 90
    let r = repo.pull(&remote)?;
91
    if !r.changed {
94084087 Andy McCall ↶ 92
        sp.done(&format!("{} {}", ui::ok(ui::glyph("✔", "*")), ui::dim("Already up to date.")));
fce44ae9 Andy McCall ↶ 93
        return Ok(0);
94
    }
135212de Andy McCall ↶ 95
    sp.done(&format!(
96
        "{} {} now has {}{}",
94084087 Andy McCall ↶ 97
        ui::done("Pulled:"),
98
        ui::bookmark(&repo.config.bookmark),
fce44ae9 Andy McCall ↶ 99
        plural(r.heads.len(), "head"),
94084087 Andy McCall ↶ 100
        ui::dim(if r.checked_out { "; working copy updated" } else { "; run oxy checkout to update the working copy" })
135212de Andy McCall ↶ 101
    ));
fce44ae9 Andy McCall ↶ 102
    let snap = repo.snapshot("oxy pull")?;
103
    if snap.base_snapshot.is_conflicted() {
94084087 Andy McCall ↶ 104
        println!("  {} {}", ui::caution(), ui::warn("the result has conflicts; see oxy status"));
fce44ae9 Andy McCall ↶ 105
    }
106
    Ok(0)
107
}
108
109
pub fn push(remote: Option<&str>, force: bool) -> Result<i32> {
110
    let repo = open()?;
111
    let remote = remote_name(remote);
135212de Andy McCall ↶ 112
    let sp = ui::spinner(&format!("Pushing to {remote}…"));
113
    let results = repo.push(&remote, force)?;
114
    sp.clear();
fce44ae9 Andy McCall ↶ 115
    let mut code = 0;
135212de Andy McCall ↶ 116
    for r in results {
fce44ae9 Andy McCall ↶ 117
        if r.ok {
94084087 Andy McCall ↶ 118
            println!("{} {}{}{}", ui::done("Pushed"), ui::id(format!("{remote}/{}", r.name)), ui::sep(), ui::dim(if r.reason.is_empty() { "updated" } else { r.reason.as_str() }));
fce44ae9 Andy McCall ↶ 119
        } else {
94084087 Andy McCall ↶ 120
            println!("{} {} {}{}{}", ui::err(ui::glyph("✖", "x")), ui::err("Rejected"), ui::id(format!("{remote}/{}", r.name)), ui::sep(), r.reason);
fce44ae9 Andy McCall ↶ 121
            code = 1;
122
        }
123
    }
124
    Ok(code)
125
}
126
2b5ee371 Andy McCall ↶ 127
pub fn serve(root: PathBuf, bind: &str, tokens: Vec<String>, tls: Option<(PathBuf, PathBuf)>) -> Result<i32> {
fce44ae9 Andy McCall ↶ 128
    let listener = std::net::TcpListener::bind(bind).with_context(|| format!("binding {bind}"))?;
129
    let root = root.canonicalize()?;
2b5ee371 Andy McCall ↶ 130
    let tls = tls.map(|(cert, key)| oxy_server::TlsFiles { cert, key });
fce44ae9 Andy McCall ↶ 131
    println!(
2b5ee371 Andy McCall ↶ 132
        "Serving repositories under {} on {}://{bind}/<repo>/oxy/v1/ ({})",
fce44ae9 Andy McCall ↶ 133
        root.display(),
2b5ee371 Andy McCall ↶ 134
        if tls.is_some() { "https" } else { "http" },
fce44ae9 Andy McCall ↶ 135
        if tokens.is_empty() { "open: no push tokens configured" } else { "push requires a token" }
136
    );
2b5ee371 Andy McCall ↶ 137
    if tls.is_none() && !bind.starts_with("127.") && !bind.starts_with("localhost") && !bind.starts_with("[::1]") {
138
        eprintln!("warning: serving plain HTTP on a non-loopback address; put a TLS terminator in front or pass --tls-cert/--tls-key");
139
    }
140
    oxy_server::run_blocking(listener, oxy_server::ServerConfig { root, tokens, tls })?;
fce44ae9 Andy McCall ↶ 141
    Ok(0)
142
}
79ab8528 Andy McCall ↶ 143
30ea9c1e Andy McCall ↶ 144
pub fn git_export(git_dir: &std::path::Path, branch: Option<&str>) -> Result<i32> {
79ab8528 Andy McCall ↶ 145
    let repo = open()?;
135212de Andy McCall ↶ 146
    let sp = ui::spinner("Exporting to Git…");
30ea9c1e Andy McCall ↶ 147
    let r = match branch {
148
        Some(b) => repo.git_export_as(git_dir, b)?,
149
        None => repo.git_export(git_dir)?,
150
    };
135212de Andy McCall ↶ 151
    sp.clear();
79ab8528 Andy McCall ↶ 152
    println!(
94084087 Andy McCall ↶ 153
        "{} {} to {} as branch {} {}",
154
        ui::done("Exported"),
e8b4e156 Andy McCall ↶ 155
        plural(r.exported, "new state"),
94084087 Andy McCall ↶ 156
        ui::path(git_dir.display()),
157
        ui::bookmark(&r.branch),
158
        ui::dim(format!("(currently {}; {} already exported)", plural(r.heads, "head"), r.skipped))
79ab8528 Andy McCall ↶ 159
    );
160
    Ok(0)
161
}
c3069537 Andy McCall ↶ 162
30ea9c1e Andy McCall ↶ 163
pub fn git_fetch(url: &str, branch: &str) -> Result<i32> {
164
    let repo = open()?;
165
    let sp = ui::spinner(&format!("Fetching {url} {branch}…"));
166
    let r = repo.git_fetch(url, branch)?;
167
    sp.clear();
168
    if r.commits == 0 {
169
        println!("{} {}", ui::done("Fetched"), ui::dim(format!("nothing new from {url} {branch}")));
170
    } else {
171
        println!(
172
            "{} {} ({} merges) from {} {}{}{} now has {}",
173
            ui::done("Fetched"),
174
            plural(r.commits, "new commit"),
175
            r.merges,
176
            ui::path(url),
177
            ui::bookmark(branch),
178
            ui::sep(),
179
            ui::bookmark(&repo.config.bookmark),
180
            plural(r.heads, "head")
181
        );
182
        if !repo.snapshot("oxy git fetch")?.changed {
183
            println!("  {} {}", ui::note(), ui::dim("working copy updated"));
184
        } else {
185
            println!("  {} {}", ui::note(), ui::dim("run oxy checkout to update the working copy"));
186
        }
187
    }
188
    if r.skipped_submodules > 0 {
189
        println!("  {} {}", ui::note(), ui::dim(format!("skipped {} submodule entries", r.skipped_submodules)));
190
    }
191
    Ok(0)
192
}
193
194
pub fn git_push(url: &str, branch: &str) -> Result<i32> {
195
    let repo = open()?;
196
    let sp = ui::spinner(&format!("Pushing to {url} {branch}…"));
197
    let r = repo.git_push(url, branch)?;
198
    sp.clear();
199
    println!(
200
        "{} {} to {} {} {}",
201
        ui::done("Pushed"),
202
        plural(r.exported, "new commit"),
203
        ui::path(url),
204
        ui::bookmark(&r.branch),
205
        ui::dim(format!("({} already there)", r.skipped))
206
    );
207
    Ok(0)
208
}
209
c3069537 Andy McCall ↶ 210
pub fn git_import(git_dir: &std::path::Path, dest: &std::path::Path, branch: &str) -> Result<i32> {
211
    let repo = Repo::init(dest)?;
212
    let started = std::time::Instant::now();
135212de Andy McCall ↶ 213
    let sp = ui::spinner(&format!("Importing {} {branch}…", git_dir.display()));
c3069537 Andy McCall ↶ 214
    let r = repo.import_git(git_dir, branch)?;
135212de Andy McCall ↶ 215
    sp.clear();
c3069537 Andy McCall ↶ 216
    println!(
94084087 Andy McCall ↶ 217
        "{} {} ({} merges) from {} {} into {} {}",
218
        ui::done("Imported"),
c3069537 Andy McCall ↶ 219
        plural(r.commits, "commit"),
220
        r.merges,
94084087 Andy McCall ↶ 221
        ui::path(git_dir.display()),
222
        ui::bookmark(branch),
223
        ui::path(repo.root().display()),
224
        ui::dim(format!("in {:.1?}; {} now has {}", started.elapsed(), repo.config.bookmark, plural(r.heads, "head")))
c3069537 Andy McCall ↶ 225
    );
94084087 Andy McCall ↶ 226
    if r.skipped_submodules > 0 {
227
        println!("  {} {}", ui::note(), ui::dim(format!("skipped {} submodule entries", r.skipped_submodules)));
228
    }
c3069537 Andy McCall ↶ 229
    Ok(0)
230
}
2863456a Andy McCall ↶ 231
232
pub fn deepen(remote: &str, depth: u32) -> Result<i32> {
233
    let repo = open()?;
234
    if !repo.is_shallow() {
235
        println!("{}", ui::dim("This repository is not shallow; nothing to deepen."));
236
        return Ok(0);
237
    }
238
    let sp = ui::spinner(&format!("Fetching {depth} more levels from {remote}…"));
239
    let n = repo.deepen(remote, depth)?;
240
    sp.done(&format!("{} {}; {}", ui::ok("Deepened by"), plural(n, "change"), if repo.is_shallow() { "still shallow".to_string() } else { ui::ok("history is now complete") }));
241
    Ok(0)
242
}