mirror of
https://seed.radicle.dev/rad:z39mP9rQAaGmERfUMPULfPUi473tY.git
synced 2026-10-25 06:10:43 +08:00
406 lines
14 KiB
Rust
406 lines
14 KiB
Rust
#[path = "patch/common.rs"]
|
|
mod common;
|
|
#[path = "patch/review.rs"]
|
|
mod review;
|
|
#[path = "patch/select.rs"]
|
|
mod select;
|
|
|
|
use std::ffi::OsString;
|
|
|
|
use anyhow::anyhow;
|
|
|
|
use radicle::cob::ObjectId;
|
|
use radicle::identity::RepoId;
|
|
use radicle::patch::{Patch, Revision, RevisionId, Status};
|
|
|
|
use radicle::storage::git::Repository;
|
|
use radicle_cli::git::Rev;
|
|
use radicle_cli::terminal;
|
|
use radicle_cli::terminal::args::{string, Args, Error, Help};
|
|
|
|
use crate::cob::patch;
|
|
use crate::cob::patch::Filter;
|
|
|
|
pub const HELP: Help = Help {
|
|
name: "patch",
|
|
description: "Terminal interfaces for patches",
|
|
version: env!("CARGO_PKG_VERSION"),
|
|
usage: r#"
|
|
Usage
|
|
|
|
rad-tui patch select [<option>...]
|
|
|
|
Select options
|
|
|
|
--mode <MODE> Set selection mode; see MODE below (default: operation)
|
|
--all Show all patches, including merged and archived patches
|
|
--archived Show only archived patches
|
|
--merged Show only merged patches
|
|
--open Show only open patches (default)
|
|
--draft Show only draft patches
|
|
--authored Show only patches that you have authored
|
|
--author <did> Show only patched where the given user is an author
|
|
(may be specified multiple times)
|
|
|
|
The MODE argument can be 'operation' or 'id'. 'operation' selects a patch id and
|
|
an operation, whereas 'id' selects a patch id only.
|
|
|
|
|
|
Other options
|
|
|
|
--help Print help
|
|
"#,
|
|
};
|
|
|
|
pub struct Options {
|
|
op: Operation,
|
|
repo: Option<RepoId>,
|
|
}
|
|
|
|
pub enum Operation {
|
|
Select { opts: SelectOptions },
|
|
Review { opts: ReviewOptions },
|
|
}
|
|
|
|
#[derive(PartialEq, Eq)]
|
|
pub enum OperationName {
|
|
Select,
|
|
Review,
|
|
}
|
|
|
|
#[derive(Debug, Default, Clone, PartialEq, Eq)]
|
|
pub struct SelectOptions {
|
|
mode: common::Mode,
|
|
filter: patch::Filter,
|
|
}
|
|
|
|
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
pub struct ReviewOptions {
|
|
patch_id: Option<Rev>,
|
|
revision_id: Option<Rev>,
|
|
}
|
|
|
|
impl ReviewOptions {
|
|
pub fn revision_or_latest<'a>(
|
|
&'a self,
|
|
patch: &'a Patch,
|
|
repo: &Repository,
|
|
) -> anyhow::Result<(RevisionId, &Revision)> {
|
|
let revision_id = self
|
|
.revision_id
|
|
.as_ref()
|
|
.map(|rev| rev.resolve::<radicle::git::Oid>(&repo.backend))
|
|
.transpose()?
|
|
.map(radicle::cob::patch::RevisionId::from);
|
|
|
|
match revision_id {
|
|
Some(id) => Ok((
|
|
id,
|
|
patch
|
|
.revision(&id)
|
|
.ok_or_else(|| anyhow!("Patch revision `{id}` not found"))?,
|
|
)),
|
|
None => Ok((patch.latest().0, patch.latest().1)),
|
|
}
|
|
}
|
|
}
|
|
|
|
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 op: Option<OperationName> = None;
|
|
let mut repo = None;
|
|
let mut select_opts = SelectOptions::default();
|
|
let mut patch_id = None;
|
|
let mut revision_id = None;
|
|
|
|
while let Some(arg) = parser.next()? {
|
|
match arg {
|
|
Long("help") | Short('h') => {
|
|
return Err(Error::Help.into());
|
|
}
|
|
|
|
// select options.
|
|
Long("mode") | Short('m') if op == Some(OperationName::Select) => {
|
|
let val = parser.value()?;
|
|
let val = val.to_str().unwrap_or_default();
|
|
|
|
select_opts.mode = match val {
|
|
"operation" => common::Mode::Operation,
|
|
"id" => common::Mode::Id,
|
|
unknown => anyhow::bail!("unknown mode '{}'", unknown),
|
|
};
|
|
}
|
|
Long("all") if op == Some(OperationName::Select) => {
|
|
select_opts.filter = select_opts.filter.with_status(None);
|
|
}
|
|
Long("draft") if op == Some(OperationName::Select) => {
|
|
select_opts.filter = select_opts.filter.with_status(Some(Status::Draft));
|
|
}
|
|
Long("archived") if op == Some(OperationName::Select) => {
|
|
select_opts.filter = select_opts.filter.with_status(Some(Status::Archived));
|
|
}
|
|
Long("merged") if op == Some(OperationName::Select) => {
|
|
select_opts.filter = select_opts.filter.with_status(Some(Status::Merged));
|
|
}
|
|
Long("open") if op == Some(OperationName::Select) => {
|
|
select_opts.filter = select_opts.filter.with_status(Some(Status::Open));
|
|
}
|
|
Long("authored") if op == Some(OperationName::Select) => {
|
|
select_opts.filter = select_opts.filter.with_authored(true);
|
|
}
|
|
Long("author") if op == Some(OperationName::Select) => {
|
|
select_opts.filter = select_opts
|
|
.filter
|
|
.with_author(terminal::args::did(&parser.value()?)?);
|
|
}
|
|
Long("repo") => {
|
|
let val = parser.value()?;
|
|
let rid = terminal::args::rid(&val)?;
|
|
|
|
repo = Some(rid);
|
|
}
|
|
Long("revision") => {
|
|
let val = parser.value()?;
|
|
let rev_id = terminal::args::rev(&val)?;
|
|
|
|
revision_id = Some(rev_id);
|
|
}
|
|
Value(val) if op.is_none() => match val.to_string_lossy().as_ref() {
|
|
"select" => op = Some(OperationName::Select),
|
|
"review" => op = Some(OperationName::Review),
|
|
unknown => anyhow::bail!("unknown operation '{}'", unknown),
|
|
},
|
|
Value(val) if patch_id.is_none() => {
|
|
let val = string(&val);
|
|
patch_id = Some(Rev::from(val));
|
|
}
|
|
_ => return Err(anyhow!(arg.unexpected())),
|
|
}
|
|
}
|
|
|
|
if select_opts.mode == common::Mode::Id {
|
|
select_opts.filter = Filter::default().with_status(None)
|
|
}
|
|
|
|
let op = match op.ok_or_else(|| anyhow!("an operation must be provided"))? {
|
|
OperationName::Review => Operation::Review {
|
|
opts: ReviewOptions {
|
|
patch_id,
|
|
revision_id,
|
|
},
|
|
},
|
|
OperationName::Select => Operation::Select { opts: select_opts },
|
|
};
|
|
Ok((Options { op, repo }, vec![]))
|
|
}
|
|
}
|
|
|
|
#[tokio::main]
|
|
pub async fn run(options: Options, ctx: impl terminal::Context) -> anyhow::Result<()> {
|
|
use radicle::storage::ReadStorage;
|
|
|
|
let (_, rid) = radicle::rad::cwd()
|
|
.map_err(|_| anyhow!("this command must be run in the context of a project"))?;
|
|
|
|
if let Err(err) = crate::log::enable() {
|
|
println!("{}", err);
|
|
}
|
|
|
|
match options.op {
|
|
Operation::Select { opts } => {
|
|
let profile = ctx.profile()?;
|
|
let rid = options.repo.unwrap_or(rid);
|
|
|
|
// Run TUI with patch selection interface
|
|
let selection = interface::select(opts, profile, rid).await?;
|
|
let selection = selection
|
|
.map(|o| serde_json::to_string(&o).unwrap_or_default())
|
|
.unwrap_or_default();
|
|
|
|
log::info!("About to print to `stderr`: {}", selection);
|
|
log::info!("Exiting patch selection interface..");
|
|
|
|
eprint!("{selection}");
|
|
}
|
|
Operation::Review { ref opts } => {
|
|
log::info!("Starting patch review interface in project {rid}..");
|
|
|
|
let profile = ctx.profile()?;
|
|
let rid = options.repo.unwrap_or(rid);
|
|
let repo = profile.storage.repository(rid).unwrap();
|
|
|
|
let patch_id: ObjectId = if let Some(patch_id) = &opts.patch_id {
|
|
patch_id.resolve(&repo.backend)?
|
|
} else {
|
|
anyhow::bail!("a patch must be provided");
|
|
};
|
|
|
|
// Run TUI with patch review interface
|
|
interface::review(opts.clone(), profile, rid, patch_id).await?;
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
|
|
mod interface {
|
|
use anyhow::anyhow;
|
|
|
|
use radicle::cob;
|
|
use radicle::cob::ObjectId;
|
|
use radicle::crypto::Signer;
|
|
use radicle::identity::RepoId;
|
|
use radicle::patch::PatchId;
|
|
use radicle::patch::Verdict;
|
|
use radicle::storage::git::cob::DraftStore;
|
|
use radicle::storage::ReadStorage;
|
|
use radicle::Profile;
|
|
|
|
use radicle_cli::terminal;
|
|
|
|
use radicle_tui::Selection;
|
|
|
|
use crate::cob::patch;
|
|
use crate::tui_patch::review::builder::CommentBuilder;
|
|
use crate::tui_patch::review::ReviewAction;
|
|
use crate::tui_patch::select;
|
|
|
|
use super::review;
|
|
use super::review::builder::ReviewBuilder;
|
|
use super::{ReviewOptions, SelectOptions};
|
|
|
|
pub async fn select(
|
|
opts: SelectOptions,
|
|
profile: Profile,
|
|
rid: RepoId,
|
|
) -> anyhow::Result<Option<Selection<ObjectId>>> {
|
|
let repository = profile.storage.repository(rid).unwrap();
|
|
|
|
log::info!("Starting patch selection interface in project {}..", rid);
|
|
|
|
let context = select::Context {
|
|
profile,
|
|
repository,
|
|
mode: opts.mode,
|
|
filter: opts.filter.clone(),
|
|
};
|
|
|
|
select::App::new(context, true).run().await
|
|
}
|
|
|
|
pub async fn review(
|
|
opts: ReviewOptions,
|
|
profile: Profile,
|
|
rid: RepoId,
|
|
patch_id: PatchId,
|
|
) -> anyhow::Result<()> {
|
|
let repo = profile.storage.repository(rid).unwrap();
|
|
let signer = terminal::signer(&profile)?;
|
|
|
|
let patch = patch::find(&profile, &repo, &patch_id)?
|
|
.ok_or_else(|| anyhow!("Patch `{patch_id}` not found"))?;
|
|
|
|
let (_, revision) = opts.revision_or_latest(&patch, &repo)?;
|
|
let hunks = ReviewBuilder::new(&repo).hunks(revision)?;
|
|
|
|
let drafts = DraftStore::new(&repo, *signer.public_key());
|
|
let mut patches = cob::patch::Cache::no_cache(&drafts)?;
|
|
let mut patch = patches.get_mut(&patch_id)?;
|
|
|
|
if let Some(review) = revision.review_by(signer.public_key()) {
|
|
// Review already finalized. Do nothing and warn.
|
|
terminal::warning(format!(
|
|
"Review ({}) already finalized. Exiting.",
|
|
review.id()
|
|
));
|
|
|
|
return Ok(());
|
|
};
|
|
|
|
if let Some((id, _)) = patch::find_review(&patch, revision, &signer) {
|
|
// Review already started, resume.
|
|
log::info!("Resuming review {id}..");
|
|
} else {
|
|
// No review to resume, start a new one.
|
|
let id = patch.review(
|
|
revision.id(),
|
|
// This is amended before the review is finalized, if all hunks are
|
|
// accepted. We can't set this to `None`, as that will be invalid without
|
|
// a review summary.
|
|
Some(Verdict::Reject),
|
|
None,
|
|
vec![],
|
|
&signer,
|
|
)?;
|
|
|
|
log::info!("Starting new review {id}..");
|
|
}
|
|
|
|
loop {
|
|
// Reload review
|
|
let signer = profile.signer()?;
|
|
let (review_id, review) = patch::find_review(&patch, revision, &signer)
|
|
.ok_or_else(|| anyhow!("Could not find review."))?;
|
|
|
|
let selection = review::Tui::new(
|
|
profile.storage.clone(),
|
|
rid,
|
|
signer,
|
|
patch_id,
|
|
patch.title().to_string(),
|
|
revision.clone(),
|
|
review.clone(),
|
|
hunks.clone(),
|
|
)
|
|
.run()
|
|
.await?;
|
|
|
|
log::info!("Received selection from TUI: {:?}", selection);
|
|
|
|
if let Some(selection) = selection.as_ref() {
|
|
match selection.action {
|
|
ReviewAction::Comment => {
|
|
let hunk = selection
|
|
.hunk
|
|
.ok_or_else(|| anyhow!("expected a selected hunk"))?;
|
|
let item = hunks
|
|
.get(hunk)
|
|
.ok_or_else(|| anyhow!("expected a hunk to comment on"))?;
|
|
|
|
let (old, new) = item.paths();
|
|
let path = old.or(new);
|
|
|
|
if let (Some(hunk), Some((path, _))) = (item.hunk(), path) {
|
|
let builder = CommentBuilder::new(revision.head(), path.to_path_buf());
|
|
let comments = builder.edit(hunk)?;
|
|
|
|
let signer = profile.signer()?;
|
|
patch.transaction("Review comments", &signer, |tx| {
|
|
for comment in comments {
|
|
tx.review_comment(
|
|
review_id,
|
|
comment.body,
|
|
Some(comment.location),
|
|
None, // Not a reply.
|
|
vec![], // No embeds.
|
|
)?;
|
|
}
|
|
Ok(())
|
|
})?;
|
|
} else {
|
|
log::warn!("Commenting on binary blobs is not yet implemented");
|
|
}
|
|
}
|
|
}
|
|
} else {
|
|
break;
|
|
}
|
|
}
|
|
|
|
Ok(())
|
|
}
|
|
}
|