rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5 heartwoode65b4866bfb72eb9e4f9fe81c88c72347e9dac43
{
"request": "trigger",
"version": 1,
"event_type": "patch",
"repository": {
"id": "rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5",
"name": "heartwood",
"description": "Radicle Heartwood Protocol & Stack",
"private": false,
"default_branch": "master",
"delegates": [
"did:key:z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT",
"did:key:z6MktaNvN1KVFMkSRAiN4qK5yvX1zuEEaseeX5sffhzPZRZW",
"did:key:z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM",
"did:key:z6MkgFq6z5fkF2hioLLSNu1zP2qEL1aHXHZzGH1FLFGAnBGz",
"did:key:z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz"
]
},
"action": "Created",
"patch": {
"id": "6719913fa5e596f5946e2a59141f31c4a5b51fcb",
"author": {
"id": "did:key:z6Mku8hpprWTmCv3BqkssCYDfr2feUdyLSUnycVajFo9XVAx",
"alias": "levitte"
},
"title": "cli/init: use Clap",
"state": {
"status": "open",
"conflicts": []
},
"before": "5caa7b302a7d4f247aaa7cc688a692aac4486464",
"after": "e65b4866bfb72eb9e4f9fe81c88c72347e9dac43",
"commits": [
"e65b4866bfb72eb9e4f9fe81c88c72347e9dac43"
],
"target": "5caa7b302a7d4f247aaa7cc688a692aac4486464",
"labels": [],
"assignees": [],
"revisions": [
{
"id": "6719913fa5e596f5946e2a59141f31c4a5b51fcb",
"author": {
"id": "did:key:z6Mku8hpprWTmCv3BqkssCYDfr2feUdyLSUnycVajFo9XVAx",
"alias": "levitte"
},
"description": "",
"base": "5caa7b302a7d4f247aaa7cc688a692aac4486464",
"oid": "e65b4866bfb72eb9e4f9fe81c88c72347e9dac43",
"timestamp": 1759521687
}
]
}
}
{
"response": "triggered",
"run_id": {
"id": "ba740c47-596c-4724-b079-daf11111c2b7"
},
"info_url": "https://cci.rad.levitte.org//ba740c47-596c-4724-b079-daf11111c2b7.html"
}
Started at: 2025-10-03 22:01:28.149673+02:00
Commands:
$ rad clone rad:z3gqcJUoA1n9HaHKufZs5FCSGazv5 .
✓ Creating checkout in ./...
✓ Remote cloudhead@z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT added
✓ Remote-tracking branch cloudhead@z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT/master created for z6MksFqXN3Yhqk8pTJdUGLwATkRfQvwZXPqR2qMEhbS9wzpT
✓ Remote cloudhead@z6MktaNvN1KVFMkSRAiN4qK5yvX1zuEEaseeX5sffhzPZRZW added
✓ Remote-tracking branch cloudhead@z6MktaNvN1KVFMkSRAiN4qK5yvX1zuEEaseeX5sffhzPZRZW/master created for z6MktaNvN1KVFMkSRAiN4qK5yvX1zuEEaseeX5sffhzPZRZW
✓ Remote fintohaps@z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM added
✓ Remote-tracking branch fintohaps@z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM/master created for z6MkireRatUThvd3qzfKht1S44wpm4FEWSSa4PRMTSQZ3voM
✓ Remote erikli@z6MkgFq6z5fkF2hioLLSNu1zP2qEL1aHXHZzGH1FLFGAnBGz added
✓ Remote-tracking branch erikli@z6MkgFq6z5fkF2hioLLSNu1zP2qEL1aHXHZzGH1FLFGAnBGz/master created for z6MkgFq6z5fkF2hioLLSNu1zP2qEL1aHXHZzGH1FLFGAnBGz
✓ Remote lorenz@z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz added
✓ Remote-tracking branch lorenz@z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz/master created for z6MkkPvBfjP4bQmco5Dm7UGsX2ruDBieEHi8n9DVJWX5sTEz
✓ Repository successfully cloned under /opt/radcis/ci.rad.levitte.org/cci/state/ba740c47-596c-4724-b079-daf11111c2b7/w/
╭────────────────────────────────────╮
│ heartwood │
│ Radicle Heartwood Protocol & Stack │
│ 124 issues · 25 patches │
╰────────────────────────────────────╯
Run `cd ./.` to go to the repository directory.
Exit code: 0
$ rad patch checkout 6719913fa5e596f5946e2a59141f31c4a5b51fcb
✓ Switched to branch patch/6719913 at revision 6719913
✓ Branch patch/6719913 setup to track rad/patches/6719913fa5e596f5946e2a59141f31c4a5b51fcb
Exit code: 0
$ git config advice.detachedHead false
Exit code: 0
$ git checkout e65b4866bfb72eb9e4f9fe81c88c72347e9dac43
HEAD is now at e65b4866 cli/init: use Clap
Exit code: 0
$ git show e65b4866bfb72eb9e4f9fe81c88c72347e9dac43
commit e65b4866bfb72eb9e4f9fe81c88c72347e9dac43
Author: Richard Levitte <richard@levitte.org>
Date: Fri Oct 3 22:01:04 2025 +0200
cli/init: use Clap
diff --git a/crates/radicle-cli/src/commands/help.rs b/crates/radicle-cli/src/commands/help.rs
index 459df8fa..6721a3be 100644
--- a/crates/radicle-cli/src/commands/help.rs
+++ b/crates/radicle-cli/src/commands/help.rs
@@ -45,7 +45,10 @@ const COMMANDS: &[CommandItem] = &[
CommandItem::Lexopt(crate::commands::fork::HELP),
CommandItem::Lexopt(crate::commands::help::HELP),
CommandItem::Lexopt(crate::commands::id::HELP),
- CommandItem::Lexopt(crate::commands::init::HELP),
+ CommandItem::Clap {
+ name: "init",
+ about: crate::commands::init::ABOUT,
+ },
CommandItem::Lexopt(crate::commands::inbox::HELP),
CommandItem::Lexopt(crate::commands::inspect::HELP),
CommandItem::Clap {
diff --git a/crates/radicle-cli/src/commands/init.rs b/crates/radicle-cli/src/commands/init.rs
index a68ea8da..60c65a18 100644
--- a/crates/radicle-cli/src/commands/init.rs
+++ b/crates/radicle-cli/src/commands/init.rs
@@ -3,13 +3,14 @@
use std::collections::HashSet;
use std::convert::TryFrom;
use std::env;
-use std::ffi::OsString;
use std::path::PathBuf;
use std::str::FromStr;
use anyhow::{anyhow, bail, Context as _};
use serde_json as json;
+use clap::Parser;
+
use radicle::crypto::ssh;
use radicle::explorer::ExplorerUrl;
use radicle::git::raw;
@@ -25,168 +26,78 @@ use radicle::{profile, Node};
use crate::commands;
use crate::git;
use crate::terminal as term;
-use crate::terminal::args::{Args, Error, Help};
use crate::terminal::Interactive;
-pub const HELP: Help = Help {
- name: "init",
- description: "Initialize a Radicle repository",
- version: env!("RADICLE_VERSION"),
- usage: r#"
-Usage
-
- rad init [<path>] [<option>...]
-
-Options
-
- --name <string> Name of the repository
- --description <string> Description of the repository
- --default-branch <name> The default branch of the repository
- --scope <scope> Repository follow scope: `followed` or `all` (default: all)
- --private Set repository visibility to *private*
- --public Set repository visibility to *public*
- --existing <rid> Setup repository as an existing Radicle repository
- -u, --set-upstream Setup the upstream of the default branch
- --setup-signing Setup the radicle key as a signing key for this repository
- --no-confirm Don't ask for confirmation during setup
- --no-seed Don't seed this repository after initializing it
- -v, --verbose Verbose mode
- --help Print help
-"#,
-};
-
-#[derive(Default)]
-pub struct Options {
+pub(crate) const ABOUT: &str = "Initialize a Radicle repository";
+// Usage
+//
+// rad init [<path>] [<option>...]
+//
+// Options
+//
+// --name <string> Name of the repository
+// --description <string> Description of the repository
+// --default-branch <name> The default branch of the repository
+// --scope <scope> Repository follow scope: `followed` or `all` (default: all)
+// --private Set repository visibility to *private*
+// --public Set repository visibility to *public*
+// --existing <rid> Setup repository as an existing Radicle repository
+// -u, --set-upstream Setup the upstream of the default branch
+// --setup-signing Setup the radicle key as a signing key for this repository
+// --no-confirm Don't ask for confirmation during setup
+// --no-seed Don't seed this repository after initializing it
+// -v, --verbose Verbose mode
+// --help Print help
+// "#,
+// };
+
+#[derive(Debug, Parser)]
+#[command(about = ABOUT, disable_version_flag = true)]
+pub struct Args {
+ /// Directory to be initialized
pub path: Option<PathBuf>,
+ /// Name of the repository
+ #[arg(long, value_name = "STRING")]
pub name: Option<ProjectName>,
+ /// Description of the repository
+ #[arg(long, value_name = "STRING")]
pub description: Option<String>,
+ /// The default branch of the repository
+ #[arg(long = "default-branch", value_name = "NAME")]
pub branch: Option<String>,
- pub interactive: Interactive,
- pub visibility: Option<Visibility>,
- pub existing: Option<RepoId>,
- pub setup_signing: bool,
+ /// Repository follow scope: `followed` or `all`
+ #[arg(long, default_value_t = Scope::All)]
pub scope: Scope,
+ /// Set repository visibility to *private*
+ #[arg(long, conflicts_with = "public")]
+ pub private: bool,
+ /// Set repository visibility to *public*
+ #[arg(long, conflicts_with = "private", default_value_t = true)]
+ pub public: bool,
+ /// Setup repository as an existing Radicle repository
+ #[arg(long, value_name = "RID")]
+ pub existing: Option<RepoId>,
+ /// Setup the upstream of the default branch
+ #[arg(short = 'u', long)]
pub set_upstream: bool,
+ /// Setup the radicle key as a signing key for this repository
+ #[arg(long)]
+ pub setup_signing: bool,
+ /// Don't ask for confirmation during setup
+ #[arg(long)]
+ pub no_confirm: bool,
+ /// Don't seed this repository after initializing it
+ #[arg(long)]
+ pub no_seed: bool,
+ /// Verbose mode
+ #[arg(short, long)]
pub verbose: bool,
- pub seed: bool,
}
-impl Args for Options {
- fn from_args(args: Vec<OsString>) -> anyhow::Result<(Self, Vec<OsString>)> {
- use lexopt::prelude::*;
-
- let mut parser = lexopt::Parser::from_args(args);
- let mut path: Option<PathBuf> = None;
-
- let mut name = None;
- let mut description = None;
- let mut branch = None;
- let mut interactive = Interactive::Yes;
- let mut set_upstream = false;
- let mut setup_signing = false;
- let mut scope = Scope::All;
- let mut existing = None;
- let mut seed = true;
- let mut verbose = false;
- let mut visibility = None;
-
- while let Some(arg) = parser.next()? {
- match arg {
- Long("name") if name.is_none() => {
- let value = parser.value()?;
- let value = term::args::string(&value);
- let value = ProjectName::try_from(value)?;
-
- name = Some(value);
- }
- Long("description") if description.is_none() => {
- let value = parser
- .value()?
- .to_str()
- .ok_or(anyhow::anyhow!(
- "invalid repository description specified with `--description`"
- ))?
- .to_owned();
-
- description = Some(value);
- }
- Long("default-branch") if branch.is_none() => {
- let value = parser
- .value()?
- .to_str()
- .ok_or(anyhow::anyhow!(
- "invalid branch specified with `--default-branch`"
- ))?
- .to_owned();
-
- branch = Some(value);
- }
- Long("scope") => {
- let value = parser.value()?;
-
- scope = term::args::parse_value("scope", value)?;
- }
- Long("set-upstream") | Short('u') => {
- set_upstream = true;
- }
- Long("setup-signing") => {
- setup_signing = true;
- }
- Long("no-confirm") => {
- interactive = Interactive::No;
- }
- Long("no-seed") => {
- seed = false;
- }
- Long("private") => {
- visibility = Some(Visibility::private([]));
- }
- Long("public") => {
- visibility = Some(Visibility::Public);
- }
- Long("existing") if existing.is_none() => {
- let val = parser.value()?;
- let rid = term::args::rid(&val)?;
-
- existing = Some(rid);
- }
- Long("verbose") | Short('v') => {
- verbose = true;
- }
- Long("help") | Short('h') => {
- return Err(Error::Help.into());
- }
- Value(val) if path.is_none() => {
- path = Some(val.into());
- }
- _ => anyhow::bail!(arg.unexpected()),
- }
- }
-
- Ok((
- Options {
- path,
- name,
- description,
- branch,
- scope,
- existing,
- interactive,
- set_upstream,
- setup_signing,
- seed,
- visibility,
- verbose,
- },
- vec![],
- ))
- }
-}
-
-pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
+pub fn run(args: Args, ctx: impl term::Context) -> anyhow::Result<()> {
let profile = ctx.profile()?;
let cwd = env::current_dir()?;
- let path = options.path.as_deref().unwrap_or(cwd.as_path());
+ let path = args.path.as_deref().unwrap_or(cwd.as_path());
let repo = match git::Repository::open(path) {
Ok(r) => r,
Err(e) if radicle::git::ext::is_not_found_err(&e) => {
@@ -200,20 +111,21 @@ pub fn run(options: Options, ctx: impl term::Context) -> anyhow::Result<()> {
}
}
- if let Some(rid) = options.existing {
- init_existing(repo, rid, options, &profile)
+ if let Some(rid) = args.existing {
+ init_existing(repo, rid, args, &profile)
} else {
- init(repo, options, &profile)
+ init(repo, args, &profile)
}
}
pub fn init(
repo: git::Repository,
- options: Options,
+ args: Args,
profile: &profile::Profile,
) -> anyhow::Result<()> {
let path = dunce::canonicalize(repo.workdir().unwrap_or_else(|| repo.path()))?;
- let interactive = options.interactive;
+ let interactive = if args.no_confirm { Interactive::No } else { Interactive::Yes };
+ let visibility = if args.private { Some(Visibility::private([])) } else { Some(Visibility::Public) };
let default_branch = match find_default_branch(&repo) {
Err(err @ DefaultBranchError::Head) => {
@@ -232,15 +144,16 @@ pub fn init(
term::headline(format!(
"Initializing{}radicle 👾 repository in {}..",
- if let Some(visibility) = &options.visibility {
- term::format::spaced(term::format::visibility(visibility))
+
+ if let Some(ref visibility) = visibility {
+ term::format::spaced(term::format::visibility(&visibility))
} else {
term::format::default(" ").into()
},
term::format::dim(path.display())
));
- let name: ProjectName = match options.name {
+ let name: ProjectName = match args.name {
Some(name) => name,
None => {
let default = path
@@ -256,13 +169,13 @@ pub fn init(
name.ok_or_else(|| anyhow::anyhow!("A project name is required."))?
}
};
- let description = match options.description {
+ let description = match args.description {
Some(desc) => desc,
None => {
term::input("Description", None, Some("You may leave this blank"))?.unwrap_or_default()
}
};
- let branch = match options.branch {
+ let branch = match args.branch {
Some(branch) => branch,
None if interactive.yes() => term::input(
"Default branch",
@@ -274,7 +187,7 @@ pub fn init(
};
let branch = RefString::try_from(branch.clone())
.map_err(|e| anyhow!("invalid branch name {:?}: {}", branch, e))?;
- let visibility = if let Some(v) = options.visibility {
+ let visibility = if let Some(v) = visibility {
v
} else {
let selected = term::select(
@@ -308,20 +221,20 @@ pub fn init(
));
spinner.finish();
- if options.verbose {
+ if args.verbose {
term::blob(json::to_string_pretty(&proj)?);
}
// It's important to seed our own repositories to make sure that our node signals
// interest for them. This ensures that messages relating to them are relayed to us.
- if options.seed {
- profile.seed(rid, options.scope, &mut node)?;
+ if !args.no_seed {
+ profile.seed(rid, args.scope, &mut node)?;
if doc.is_public() {
profile.add_inventory(rid, &mut node)?;
}
}
- if options.set_upstream || git::branch_remote(&repo, proj.default_branch()).is_err() {
+ if args.set_upstream || git::branch_remote(&repo, proj.default_branch()).is_err() {
// Setup eg. `master` -> `rad/master`
radicle::git::set_upstream(
&repo,
@@ -333,7 +246,7 @@ pub fn init(
push_cmd = format!("git push {} {branch}", *radicle::rad::REMOTE_NAME);
}
- if options.setup_signing {
+ if args.setup_signing {
// Setup radicle signing key.
self::setup_signing(profile.id(), &repo, interactive)?;
}
@@ -378,12 +291,13 @@ pub fn init(
pub fn init_existing(
working: git::Repository,
rid: RepoId,
- options: Options,
+ args: Args,
profile: &profile::Profile,
) -> anyhow::Result<()> {
let stored = profile.storage.repository(rid)?;
let project = stored.project()?;
let url = radicle::git::Url::from(rid);
+ let interactive = if args.no_confirm { Interactive::No } else { Interactive::Yes };
radicle::git::configure_repository(&working)?;
radicle::git::configure_remote(
@@ -393,7 +307,7 @@ pub fn init_existing(
&url.clone().with_namespace(profile.public_key),
)?;
- if options.set_upstream {
+ if args.set_upstream {
// Setup eg. `master` -> `rad/master`
radicle::git::set_upstream(
&working,
@@ -403,9 +317,9 @@ pub fn init_existing(
)?;
}
- if options.setup_signing {
+ if args.setup_signing {
// Setup radicle signing key.
- self::setup_signing(profile.id(), &working, options.interactive)?;
+ self::setup_signing(profile.id(), &working, interactive)?;
}
term::success!(
diff --git a/crates/radicle-cli/src/main.rs b/crates/radicle-cli/src/main.rs
index 20ce37f6..c8c7b33f 100644
--- a/crates/radicle-cli/src/main.rs
+++ b/crates/radicle-cli/src/main.rs
@@ -46,6 +46,7 @@ struct CliArgs {
#[derive(Subcommand, Debug)]
enum Commands {
Clean(clean::Args),
+ Init(init::Args),
Issue(issue::Args),
Path(path::Args),
Stats(stats::Args),
@@ -218,7 +219,9 @@ pub(crate) fn run_other(exe: &str, args: &[OsString]) -> Result<(), Option<anyho
term::run_command_args::<inbox::Options, _>(inbox::HELP, inbox::run, args.to_vec())
}
"init" => {
- term::run_command_args::<init::Options, _>(init::HELP, init::run, args.to_vec());
+ if let Some(Commands::Init(args)) = CliArgs::parse().command {
+ term::run_command_fn(init::run, args);
+ }
}
"inspect" => {
term::run_command_args::<inspect::Options, _>(
Exit code: 0
shell: 'export RUSTDOCFLAGS=''-D warnings'' cargo --version rustc --version cargo fmt --check cargo clippy --all-targets --workspace -- --deny warnings cargo build --all-targets --workspace cargo doc --workspace --no-deps cargo test --workspace --no-fail-fast '
Commands:
$ podman run --name ba740c47-596c-4724-b079-daf11111c2b7 -v /opt/radcis/ci.rad.levitte.org/cci/state/ba740c47-596c-4724-b079-daf11111c2b7/s:/ba740c47-596c-4724-b079-daf11111c2b7/s:ro -v /opt/radcis/ci.rad.levitte.org/cci/state/ba740c47-596c-4724-b079-daf11111c2b7/w:/ba740c47-596c-4724-b079-daf11111c2b7/w -w /ba740c47-596c-4724-b079-daf11111c2b7/w -v /opt/radcis/ci.rad.levitte.org/.radicle:/${id}/.radicle:ro -e RAD_HOME=/${id}/.radicle rust:bookworm bash /ba740c47-596c-4724-b079-daf11111c2b7/s/script.sh
+ export 'RUSTDOCFLAGS=-D warnings'
+ RUSTDOCFLAGS='-D warnings'
+ cargo --version
info: syncing channel updates for '1.88-x86_64-unknown-linux-gnu'
info: latest update on 2025-06-26, rust version 1.88.0 (6b00bc388 2025-06-23)
info: downloading component 'cargo'
info: downloading component 'clippy'
info: downloading component 'rust-docs'
info: downloading component 'rust-src'
info: downloading component 'rust-std'
info: downloading component 'rustc'
info: downloading component 'rustfmt'
info: installing component 'cargo'
info: installing component 'clippy'
info: installing component 'rust-docs'
info: installing component 'rust-src'
info: installing component 'rust-std'
info: installing component 'rustc'
info: installing component 'rustfmt'
cargo 1.88.0 (873a06493 2025-05-10)
+ rustc --version
rustc 1.88.0 (6b00bc388 2025-06-23)
+ cargo fmt --check
Diff in /ba740c47-596c-4724-b079-daf11111c2b7/w/crates/radicle-cli/src/commands/init.rs:30:
pub(crate) const ABOUT: &str = "Initialize a Radicle repository";
// Usage
-//
+//
// rad init [<path>] [<option>...]
-//
+//
// Options
-//
+//
// --name <string> Name of the repository
// --description <string> Description of the repository
// --default-branch <name> The default branch of the repository
Diff in /ba740c47-596c-4724-b079-daf11111c2b7/w/crates/radicle-cli/src/commands/init.rs:118:
}
}
-pub fn init(
- repo: git::Repository,
- args: Args,
- profile: &profile::Profile,
-) -> anyhow::Result<()> {
+pub fn init(repo: git::Repository, args: Args, profile: &profile::Profile) -> anyhow::Result<()> {
let path = dunce::canonicalize(repo.workdir().unwrap_or_else(|| repo.path()))?;
- let interactive = if args.no_confirm { Interactive::No } else { Interactive::Yes };
- let visibility = if args.private { Some(Visibility::private([])) } else { Some(Visibility::Public) };
+ let interactive = if args.no_confirm {
+ Interactive::No
+ } else {
+ Interactive::Yes
+ };
+ let visibility = if args.private {
+ Some(Visibility::private([]))
+ } else {
+ Some(Visibility::Public)
+ };
let default_branch = match find_default_branch(&repo) {
Err(err @ DefaultBranchError::Head) => {
Diff in /ba740c47-596c-4724-b079-daf11111c2b7/w/crates/radicle-cli/src/commands/init.rs:144:
term::headline(format!(
"Initializing{}radicle 👾 repository in {}..",
-
if let Some(ref visibility) = visibility {
term::format::spaced(term::format::visibility(&visibility))
} else {
Diff in /ba740c47-596c-4724-b079-daf11111c2b7/w/crates/radicle-cli/src/commands/init.rs:297:
let stored = profile.storage.repository(rid)?;
let project = stored.project()?;
let url = radicle::git::Url::from(rid);
- let interactive = if args.no_confirm { Interactive::No } else { Interactive::Yes };
+ let interactive = if args.no_confirm {
+ Interactive::No
+ } else {
+ Interactive::Yes
+ };
radicle::git::configure_repository(&working)?;
radicle::git::configure_remote(
Exit code: 1
{
"response": "finished",
"result": "failure"
}