OXYGENHUB
# 1983686fb7a7 oxygen / src / main.rs
11.8 KiB · Rust · last changed Import the Oxygen specification and the first Rust implementation (root change) 1 month ago source blame history raw
1
//! `oxy`: command-line interface for Oxygen.
2
3
use anyhow::{bail, Context, Result};
4
use clap::{Parser, Subcommand};
5
use oxy_core::repo::{ChangeStatus, Repo, SignatureStatus};
6
use std::path::PathBuf;
7
8
#[derive(Parser)]
9
#[command(name = "oxy", version, about = "Oxygen: breathing fresh air into version control")]
10
struct Cli {
11
    #[command(subcommand)]
12
    cmd: Cmd,
13
}
14
15
#[derive(Subcommand)]
16
enum Cmd {
17
    /// Create a repository in PATH (default: current directory)
18
    Init { path: Option<PathBuf> },
19
    /// Show the working copy: changed paths and conflicts
20
    Status,
21
    /// Record the working copy as a change on the current bookmark
22
    Commit {
23
        #[arg(short, long)]
24
        message: String,
25
        /// Extra explicit dependencies (ChangeId prefix, #hash prefix)
26
        #[arg(long = "depends-on")]
27
        depends_on: Vec<String>,
28
    },
29
    /// List changes reachable from the bookmark and the working copy
30
    Log,
31
    /// Show what the working copy changes against its base
32
    Diff,
33
    /// Show one change (ChangeId prefix, #hash prefix, or @)
34
    Show { change: String },
35
    /// Move the working copy to the state formed by CHANGE... (default: the bookmark heads)
36
    Checkout {
37
        changes: Vec<String>,
38
        /// Throw away uncommitted working-copy changes
39
        #[arg(long)]
40
        discard: bool,
41
    },
42
    /// Undo the last operation
43
    Undo,
44
    /// Manage the signing identity
45
    Identity {
46
        #[command(subcommand)]
47
        cmd: IdentityCmd,
48
    },
49
    /// Verify the signatures on a change (default: every change in the log)
50
    Verify { change: Option<String> },
51
    /// Set a repository configuration key (author.name, author.email, author.key, core.sign, workspace.bookmark)
52
    Config { key: String, value: String },
53
    /// List operations
54
    #[command(name = "op")]
55
    Op {
56
        #[command(subcommand)]
57
        cmd: OpCmd,
58
    },
59
}
60
61
#[derive(Subcommand)]
62
enum OpCmd {
63
    Log,
64
}
65
66
#[derive(Subcommand)]
67
enum IdentityCmd {
68
    /// Generate a composite Ed25519 + ML-DSA-65 key pair and make it the author
69
    Create {
70
        #[arg(long)]
71
        name: Option<String>,
72
        #[arg(long)]
73
        email: Option<String>,
74
    },
75
    /// Show the configured identity
76
    Show,
77
}
78
79
fn signature_line(repo: &Repo, h: &oxy_core::hash::ChangeHash) -> Result<String> {
80
    Ok(match repo.verify_change(h)? {
81
        SignatureStatus::Unsigned => "unsigned".to_string(),
82
        SignatureStatus::Valid { key, name, email } => format!("signed by {name} <{email}> key {}", key.short(12)),
83
        SignatureStatus::Invalid(why) => format!("INVALID signature: {why}"),
84
    })
85
}
86
87
fn main() {
88
    match run() {
89
        Ok(code) => std::process::exit(code),
90
        Err(e) => {
91
            eprintln!("error: {e:#}");
92
            std::process::exit(1);
93
        }
94
    }
95
}
96
97
fn open() -> Result<Repo> {
98
    Repo::open(&std::env::current_dir()?).context("opening repository")
99
}
100
101
fn short_id(c: &oxy_core::objects::Change) -> String {
102
    c.change_id.short(8)
103
}
104
105
fn when(ms: u64) -> String {
106
    let secs = (ms / 1000) as i64;
107
    let days = secs.div_euclid(86_400);
108
    let rem = secs.rem_euclid(86_400);
109
    // Civil-from-days (Howard Hinnant), UTC.
110
    let z = days + 719_468;
111
    let era = z.div_euclid(146_097);
112
    let doe = z - era * 146_097;
113
    let yoe = (doe - doe / 1460 + doe / 36_524 - doe / 146_096) / 365;
114
    let y = yoe + era * 400;
115
    let doy = doe - (365 * yoe + yoe / 4 - yoe / 100);
116
    let mp = (5 * doy + 2) / 153;
117
    let d = doy - (153 * mp + 2) / 5 + 1;
118
    let m = if mp < 10 { mp + 3 } else { mp - 9 };
119
    let y = if m <= 2 { y + 1 } else { y };
120
    format!("{y:04}-{m:02}-{d:02} {:02}:{:02}:{:02}Z", rem / 3600, (rem % 3600) / 60, rem % 60)
121
}
122
123
fn run() -> Result<i32> {
124
    let cli = Cli::parse();
125
    match cli.cmd {
126
        Cmd::Init { path } => {
127
            let path = path.unwrap_or(std::env::current_dir()?);
128
            let repo = Repo::init(&path)?;
129
            println!("Initialized oxy repository in {}", repo.root().display());
130
            println!("Bookmark: {}   Author: {} <{}>", repo.config.bookmark, repo.config.author_name, repo.config.author_email);
131
            Ok(0)
132
        }
133
        Cmd::Status => {
134
            let repo = open()?;
135
            let snap = repo.snapshot("oxy status")?;
136
            let heads = repo.bookmark_heads()?;
137
            println!(
138
                "Working copy: {} on {} ({} head{})",
139
                snap.wc.change_id.short(8),
140
                repo.config.bookmark,
141
                heads.len(),
142
                if heads.len() == 1 { "" } else { "s" }
143
            );
144
            if snap.statuses.is_empty() {
145
                println!("The working copy is clean.");
146
            }
147
            for s in &snap.statuses {
148
                let tag = match s.status {
149
                    ChangeStatus::Added => "A",
150
                    ChangeStatus::Modified => "M",
151
                    ChangeStatus::Removed => "D",
152
                    ChangeStatus::ModeChanged => "X",
153
                    ChangeStatus::ConflictEdited => "C!",
154
                };
155
                println!("{tag:2} {}", s.path);
156
            }
157
            let mut code = 0;
158
            if snap.base_snapshot.is_conflicted() {
159
                println!("\nConflicts in the base state:");
160
                for c in &snap.base_snapshot.tree.conflicts {
161
                    println!("  tree: {c:?}");
162
                }
163
                for (p, f) in &snap.base_snapshot.files {
164
                    if f.is_conflicted() {
165
                        println!("  {p}");
166
                    }
167
                }
168
                code = 2;
169
            }
170
            Ok(code)
171
        }
172
        Cmd::Commit { message, depends_on } => {
173
            let repo = open()?;
174
            let mut deps = Vec::new();
175
            for d in &depends_on {
176
                deps.push(repo.resolve_change(d)?);
177
            }
178
            let h = repo.commit(&message, &deps)?;
179
            let c = repo.store().get_change(&h)?;
180
            println!("Committed {} #{}: {}", short_id(&c), h.short(12), message.lines().next().unwrap_or(""));
181
            Ok(0)
182
        }
183
        Cmd::Log => {
184
            let repo = open()?;
185
            repo.snapshot("oxy log")?;
186
            for e in repo.log()? {
187
                let c = &e.change;
188
                let mut flags = Vec::new();
189
                if e.is_working_copy {
190
                    flags.push("working copy");
191
                }
192
                if e.is_head {
193
                    flags.push("head");
194
                }
195
                let flags = if flags.is_empty() { String::new() } else { format!(" ({})", flags.join(", ")) };
196
                println!("{} #{}{}", short_id(c), e.hash.short(12), flags);
197
                println!("    {}", when(c.hlc.wall_ms));
198
                if !c.deps.is_empty() {
199
                    println!("    deps: {}", c.deps.iter().map(|d| format!("#{}", d.short(12))).collect::<Vec<_>>().join(" "));
200
                }
201
                let msg = if c.message.is_empty() { "(no description)" } else { &c.message };
202
                for line in msg.lines() {
203
                    println!("    {line}");
204
                }
205
                println!();
206
            }
207
            Ok(0)
208
        }
209
        Cmd::Diff => {
210
            let repo = open()?;
211
            let snap = repo.snapshot("oxy diff")?;
212
            print!("{}", oxy_core::repo::render_change(&snap.wc, &snap.base, &snap.base_snapshot));
213
            Ok(0)
214
        }
215
        Cmd::Show { change } => {
216
            let repo = open()?;
217
            repo.snapshot("oxy show")?;
218
            let h = repo.resolve_change(&change)?;
219
            let c = repo.store().get_change(&h)?;
220
            println!("change {} #{}", short_id(&c), h);
221
            println!("kind:   {:?}", c.kind);
222
            println!("date:   {}", when(c.hlc.wall_ms));
223
            println!("deps:   {}", c.deps.iter().map(|d| format!("#{}", d.short(12))).collect::<Vec<_>>().join(" "));
224
            println!("sig:    {}", signature_line(&repo, &h)?);
225
            println!("\n{}\n", if c.message.is_empty() { "(no description)" } else { &c.message });
226
            print!("{}", repo.describe_change(&h)?);
227
            Ok(0)
228
        }
229
        Cmd::Checkout { changes, discard } => {
230
            let repo = open()?;
231
            let heads = if changes.is_empty() {
232
                repo.bookmark_heads()?
233
            } else {
234
                changes.iter().map(|c| repo.resolve_change(c)).collect::<Result<Vec<_>, _>>()?
235
            };
236
            let spec = if changes.is_empty() { repo.config.bookmark.clone() } else { changes.join(" ") };
237
            let r = repo.checkout(&heads, discard, &format!("oxy checkout {spec}"))?;
238
            println!("Working copy now on {spec}: {} file(s) written, {} removed", r.written, r.removed);
239
            if r.conflicted {
240
                println!("This state has conflicts; see oxy status.");
241
            }
242
            Ok(0)
243
        }
244
        Cmd::Undo => {
245
            let repo = open()?;
246
            let op = repo.undo()?;
247
            println!("Undid the last operation; now at: {}", op.command);
248
            Ok(0)
249
        }
250
        Cmd::Identity { cmd: IdentityCmd::Create { name, email } } => {
251
            let mut repo = open()?;
252
            let name = name.unwrap_or_else(|| repo.config.author_name.clone());
253
            let email = email.unwrap_or_else(|| repo.config.author_email.clone());
254
            let (key, _) = repo.create_identity(&name, &email)?;
255
            println!("Created identity {name} <{email}>");
256
            println!("KeyId: {key}");
257
            println!("Secret key stored under {}", oxy_core::repo::default_keys_dir().display());
258
            if !repo.config.sign_changes {
259
                println!("Changes will carry this author; run `oxy config core.sign change` to sign each commit.");
260
            }
261
            Ok(0)
262
        }
263
        Cmd::Identity { cmd: IdentityCmd::Show } => {
264
            let repo = open()?;
265
            match repo.config.author_key {
266
                None => println!("No identity configured; run `oxy identity create`."),
267
                Some(key) => {
268
                    let id = repo.identity(&key)?;
269
                    println!("{} <{}>", id.name, id.email);
270
                    println!("KeyId:   {key}");
271
                    println!("Created: {}", when(id.created));
272
                    println!("Secret:  {}", if repo.secret_key()?.is_some() { "available" } else { "NOT FOUND in key directory" });
273
                    println!("Signing: {}", if repo.config.sign_changes { "every change (core.sign = change)" } else { "at push via seals (core.sign = seal)" });
274
                }
275
            }
276
            Ok(0)
277
        }
278
        Cmd::Verify { change } => {
279
            let repo = open()?;
280
            let hashes: Vec<oxy_core::hash::ChangeHash> = match change {
281
                Some(c) => vec![repo.resolve_change(&c)?],
282
                None => repo.log()?.into_iter().filter(|e| !e.is_working_copy).map(|e| e.hash).collect(),
283
            };
284
            let mut bad = 0;
285
            for h in hashes {
286
                let c = repo.store().get_change(&h)?;
287
                let line = signature_line(&repo, &h)?;
288
                if line.starts_with("INVALID") {
289
                    bad += 1;
290
                }
291
                println!("{} #{}  {}", short_id(&c), h.short(12), line);
292
            }
293
            Ok(if bad > 0 { 1 } else { 0 })
294
        }
295
        Cmd::Config { key, value } => {
296
            let mut repo = open()?;
297
            repo.config.set(&key, &value)?;
298
            repo.save_config()?;
299
            println!("{key} = {value}");
300
            Ok(0)
301
        }
302
        Cmd::Op { cmd: OpCmd::Log } => {
303
            let repo = open()?;
304
            for (i, (r, op)) in repo.op_log()?.into_iter().enumerate() {
305
                println!("{}{} {}  {}", if i == 0 { "@ " } else { "  " }, r.short(12), when(op.hlc.wall_ms), op.command);
306
            }
307
            Ok(0)
308
        }
309
    }
310
    .map_err(|e: anyhow::Error| e)
311
    .or_else(|e| {
312
        if e.to_string().is_empty() {
313
            bail!("unknown error")
314
        } else {
315
            Err(e)
316
        }
317
    })
318
}