| ff0af1ee unknown |
1 |
|
| 2 |
|
| 3 |
use anyhow::{bail, Context, Result}; |
| 4 |
use clap::{Parser, Subcommand}; |
| 5 |
use oxy_core::repo::{ChangeStatus, Repo}; |
| 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 |
|
| 18 |
Init { path: Option<PathBuf> }, |
| 19 |
|
| 20 |
Status, |
| 21 |
|
| 22 |
Commit { |
| 23 |
#[arg(short, long)] |
| 24 |
message: String, |
| 25 |
|
| 26 |
#[arg(long = "depends-on")] |
| 27 |
depends_on: Vec<String>, |
| 28 |
}, |
| 29 |
|
| 30 |
Log, |
| 31 |
|
| 32 |
Diff, |
| 33 |
|
| 34 |
Show { change: String }, |
| 35 |
|
| 36 |
Undo, |
| 37 |
|
| 38 |
#[command(name = "op")] |
| 39 |
Op { |
| 40 |
#[command(subcommand)] |
| 41 |
cmd: OpCmd, |
| 42 |
}, |
| 43 |
} |
| 44 |
|
| 45 |
#[derive(Subcommand)] |
| 46 |
enum OpCmd { |
| 47 |
Log, |
| 48 |
} |
| 49 |
|
| 50 |
fn main() { |
| 51 |
match run() { |
| 52 |
Ok(code) => std::process::exit(code), |
| 53 |
Err(e) => { |
| 54 |
eprintln!("error: {e:#}"); |
| 55 |
std::process::exit(1); |
| 56 |
} |
| 57 |
} |
| 58 |
} |
| 59 |
|
| 60 |
fn open() -> Result<Repo> { |
| 61 |
Repo::open(&std::env::current_dir()?).context("opening repository") |
| 62 |
} |
| 63 |
|
| 64 |
fn short_id(c: &oxy_core::objects::Change) -> String { |
| 65 |
c.change_id.short(8) |
| 66 |
} |
| 67 |
|
| 68 |
fn when(ms: u64) -> String { |
| 69 |
let secs = (ms / 1000) as i64; |
| 70 |
let days = secs.div_euclid(86_400); |
| 71 |
let rem = secs.rem_euclid(86_400); |
| 72 |
|
| 73 |
let z = days + 719_468; |
| 74 |
let era = z.div_euclid(146_097); |
| 75 |
let doe = z - era * 146_097; |
| 76 |
let yoe = (doe - doe / 1460 + doe / 36_524 - doe / 146_096) / 365; |
| 77 |
let y = yoe + era * 400; |
| 78 |
let doy = doe - (365 * yoe + yoe / 4 - yoe / 100); |
| 79 |
let mp = (5 * doy + 2) / 153; |
| 80 |
let d = doy - (153 * mp + 2) / 5 + 1; |
| 81 |
let m = if mp < 10 { mp + 3 } else { mp - 9 }; |
| 82 |
let y = if m <= 2 { y + 1 } else { y }; |
| 83 |
format!("{y:04}-{m:02}-{d:02} {:02}:{:02}:{:02}Z", rem / 3600, (rem % 3600) / 60, rem % 60) |
| 84 |
} |
| 85 |
|
| 86 |
fn run() -> Result<i32> { |
| 87 |
let cli = Cli::parse(); |
| 88 |
match cli.cmd { |
| 89 |
Cmd::Init { path } => { |
| 90 |
let path = path.unwrap_or(std::env::current_dir()?); |
| 91 |
let repo = Repo::init(&path)?; |
| 92 |
println!("Initialized oxy repository in {}", repo.root().display()); |
| 93 |
println!("Bookmark: {} Author: {} <{}>", repo.config.bookmark, repo.config.author_name, repo.config.author_email); |
| 94 |
Ok(0) |
| 95 |
} |
| 96 |
Cmd::Status => { |
| 97 |
let repo = open()?; |
| 98 |
let snap = repo.snapshot("oxy status")?; |
| 99 |
let heads = repo.bookmark_heads()?; |
| 100 |
println!( |
| 101 |
"Working copy: {} on {} ({} head{})", |
| 102 |
snap.wc.change_id.short(8), |
| 103 |
repo.config.bookmark, |
| 104 |
heads.len(), |
| 105 |
if heads.len() == 1 { "" } else { "s" } |
| 106 |
); |
| 107 |
if snap.statuses.is_empty() { |
| 108 |
println!("The working copy is clean."); |
| 109 |
} |
| 110 |
for s in &snap.statuses { |
| 111 |
let tag = match s.status { |
| 112 |
ChangeStatus::Added => "A", |
| 113 |
ChangeStatus::Modified => "M", |
| 114 |
ChangeStatus::Removed => "D", |
| 115 |
ChangeStatus::ModeChanged => "X", |
| 116 |
ChangeStatus::ConflictEdited => "C!", |
| 117 |
}; |
| 118 |
println!("{tag:2} {}", s.path); |
| 119 |
} |
| 120 |
let mut code = 0; |
| 121 |
if snap.base_snapshot.is_conflicted() { |
| 122 |
println!("\nConflicts in the base state:"); |
| 123 |
for c in &snap.base_snapshot.tree.conflicts { |
| 124 |
println!(" tree: {c:?}"); |
| 125 |
} |
| 126 |
for (p, f) in &snap.base_snapshot.files { |
| 127 |
if f.is_conflicted() { |
| 128 |
println!(" {p}"); |
| 129 |
} |
| 130 |
} |
| 131 |
code = 2; |
| 132 |
} |
| 133 |
Ok(code) |
| 134 |
} |
| 135 |
Cmd::Commit { message, depends_on } => { |
| 136 |
let repo = open()?; |
| 137 |
let mut deps = Vec::new(); |
| 138 |
for d in &depends_on { |
| 139 |
deps.push(repo.resolve_change(d)?); |
| 140 |
} |
| 141 |
let h = repo.commit(&message, &deps)?; |
| 142 |
let c = repo.store().get_change(&h)?; |
| 143 |
println!("Committed {} #{}: {}", short_id(&c), h.short(12), message.lines().next().unwrap_or("")); |
| 144 |
Ok(0) |
| 145 |
} |
| 146 |
Cmd::Log => { |
| 147 |
let repo = open()?; |
| 148 |
repo.snapshot("oxy log")?; |
| 149 |
for e in repo.log()? { |
| 150 |
let c = &e.change; |
| 151 |
let mut flags = Vec::new(); |
| 152 |
if e.is_working_copy { |
| 153 |
flags.push("working copy"); |
| 154 |
} |
| 155 |
if e.is_head { |
| 156 |
flags.push("head"); |
| 157 |
} |
| 158 |
let flags = if flags.is_empty() { String::new() } else { format!(" ({})", flags.join(", ")) }; |
| 159 |
println!("{} #{}{}", short_id(c), e.hash.short(12), flags); |
| 160 |
println!(" {}", when(c.hlc.wall_ms)); |
| 161 |
if !c.deps.is_empty() { |
| 162 |
println!(" deps: {}", c.deps.iter().map(|d| format!("#{}", d.short(12))).collect::<Vec<_>>().join(" ")); |
| 163 |
} |
| 164 |
let msg = if c.message.is_empty() { "(no description)" } else { &c.message }; |
| 165 |
for line in msg.lines() { |
| 166 |
println!(" {line}"); |
| 167 |
} |
| 168 |
println!(); |
| 169 |
} |
| 170 |
Ok(0) |
| 171 |
} |
| 172 |
Cmd::Diff => { |
| 173 |
let repo = open()?; |
| 174 |
let snap = repo.snapshot("oxy diff")?; |
| 175 |
print!("{}", oxy_core::repo::render_change(&snap.wc, &snap.base, &snap.base_snapshot)); |
| 176 |
Ok(0) |
| 177 |
} |
| 178 |
Cmd::Show { change } => { |
| 179 |
let repo = open()?; |
| 180 |
repo.snapshot("oxy show")?; |
| 181 |
let h = repo.resolve_change(&change)?; |
| 182 |
let c = repo.store().get_change(&h)?; |
| 183 |
println!("change {} #{}", short_id(&c), h); |
| 184 |
println!("kind: {:?}", c.kind); |
| 185 |
println!("date: {}", when(c.hlc.wall_ms)); |
| 186 |
println!("deps: {}", c.deps.iter().map(|d| format!("#{}", d.short(12))).collect::<Vec<_>>().join(" ")); |
| 187 |
println!("\n{}\n", if c.message.is_empty() { "(no description)" } else { &c.message }); |
| 188 |
print!("{}", repo.describe_change(&h)?); |
| 189 |
Ok(0) |
| 190 |
} |
| 191 |
Cmd::Undo => { |
| 192 |
let repo = open()?; |
| 193 |
let op = repo.undo()?; |
| 194 |
println!("Undid the last operation; now at: {}", op.command); |
| 195 |
Ok(0) |
| 196 |
} |
| 197 |
Cmd::Op { cmd: OpCmd::Log } => { |
| 198 |
let repo = open()?; |
| 199 |
for (i, (r, op)) in repo.op_log()?.into_iter().enumerate() { |
| 200 |
println!("{}{} {} {}", if i == 0 { "@ " } else { " " }, r.short(12), when(op.hlc.wall_ms), op.command); |
| 201 |
} |
| 202 |
Ok(0) |
| 203 |
} |
| 204 |
} |
| 205 |
.map_err(|e: anyhow::Error| e) |
| 206 |
.or_else(|e| { |
| 207 |
if e.to_string().is_empty() { |
| 208 |
bail!("unknown error") |
| 209 |
} else { |
| 210 |
Err(e) |
| 211 |
} |
| 212 |
}) |
| 213 |
} |