use std::time::Duration; use anyhow::{bail, Context, Result}; use futures::future::join_all; use indicatif::{MultiProgress, ProgressBar, ProgressStyle}; use nostr::{prelude::sha1::Hash as Sha1Hash, EventBuilder, Marker, Tag, TagKind}; #[cfg(not(test))] use crate::client::Client; #[cfg(test)] use crate::client::MockConnect; use crate::{ cli_interactor::{Interactor, InteractorPrompt, PromptConfirmParms, PromptInputParms}, client::Connect, git::{Repo, RepoActions}, login, repo_ref, Cli, }; #[derive(Debug, clap::Args)] pub struct SubCommandArgs { #[clap(short, long)] /// title of pull request (defaults to first line of first commit) title: Option, #[clap(short, long)] /// optional description description: Option, #[clap(long)] /// branch to get changes from (defaults to head) from_branch: Option, #[clap(long)] /// destination branch (defaults to main or master) to_branch: Option, } pub async fn launch( cli_args: &Cli, _pr_args: &super::SubCommandArgs, args: &SubCommandArgs, ) -> Result<()> { let git_repo = Repo::discover().context("cannot find a git repository")?; let (from_branch, to_branch, ahead, behind) = identify_ahead_behind(&git_repo, &args.from_branch, &args.to_branch)?; if ahead.is_empty() { bail!(format!( "'{from_branch}' is 0 commits ahead of '{to_branch}' so no patches were created" )); } if behind.is_empty() { println!( "creating patch for {} commits from '{from_branch}' that can be merged into '{to_branch}'", ahead.len(), ); } else { if !Interactor::default().confirm( PromptConfirmParms::default() .with_prompt( format!( "'{from_branch}' is {} commits behind '{to_branch}' and {} ahead. Consider rebasing before sending patches. Proceed anyway?", behind.len(), ahead.len(), ) ) .with_default(false) ).context("failed to get confirmation response from interactor confirm")? { bail!("aborting so branch can be rebased"); } println!( "creating patch for {} commit{} from '{from_branch}' that {} {} behind '{to_branch}'", ahead.len(), if ahead.len() > 1 { "s" } else { "" }, if ahead.len() > 1 { "are" } else { "is" }, behind.len(), ); } let title = match &args.title { Some(t) => t.clone(), None => Interactor::default().input(PromptInputParms::default().with_prompt("title"))?, }; let description = match &args.description { Some(t) => t.clone(), None => Interactor::default() .input(PromptInputParms::default().with_prompt("description (Optional)"))?, }; #[cfg(not(test))] let mut client = Client::default(); #[cfg(test)] let mut client = ::default(); let (keys, user_ref) = login::launch(&cli_args.nsec, &cli_args.password, Some(&client)).await?; client.set_keys(&keys).await; let events = generate_pr_and_patch_events(&title, &description, &to_branch, &git_repo, &ahead, &keys)?; let repo_ref = repo_ref::fetch( &git_repo, git_repo .get_root_commit(&to_branch) .context("failed to get root commit of the repository")? .to_string(), &client, user_ref.relays.write(), ) .await?; println!( "posting 1 pull request with {} commits...", events.len() - 1 ); send_events( &client, events, user_ref.relays.write(), repo_ref.relays.clone(), !cli_args.disable_cli_spinners, ) .await?; // TODO check if there is already a similarly named Ok(()) } pub async fn send_events( #[cfg(test)] client: &crate::client::MockConnect, #[cfg(not(test))] client: &Client, events: Vec, my_write_relays: Vec, repo_read_relays: Vec, animate: bool, ) -> Result<()> { let (_, _, _, all) = unique_and_duplicate_all(&my_write_relays, &repo_read_relays); let m = MultiProgress::new(); let pb_style = ProgressStyle::with_template(if animate { " {spinner} {prefix} {bar} {pos}/{len} {msg}" } else { " - {prefix} {bar} {pos}/{len} {msg}" })? .progress_chars("##-"); let pb_after_style = |symbol| ProgressStyle::with_template(format!(" {symbol} {}", "{prefix} {msg}",).as_str()); let pb_after_style_succeeded = pb_after_style(if animate { console::style("✔".to_string()) .for_stderr() .green() .to_string() } else { "y".to_string() })?; let pb_after_style_failed = pb_after_style(if animate { console::style("✘".to_string()) .for_stderr() .red() .to_string() } else { "x".to_string() })?; join_all(all.iter().map(|&relay| async { let details = format!( "{}{} {}", if my_write_relays.iter().any(|r| relay.eq(r)) { " [my-relay]" } else { "" }, if repo_read_relays.iter().any(|r| relay.eq(r)) { " [repo-relay]" } else { "" }, *relay, ); let pb = m.add( ProgressBar::new(events.len() as u64) .with_prefix(details.to_string()) .with_style(pb_style.clone()), ); if animate { pb.enable_steady_tick(Duration::from_millis(300)); } pb.inc(0); // need to make pb display intially let mut failed = false; for event in &events { match client.send_event_to(relay.as_str(), event.clone()).await { Ok(_) => pb.inc(1), Err(e) => { pb.set_style(pb_after_style_failed.clone()); pb.finish_with_message( console::style( e.to_string() .replace("relay pool error:", "error:") .replace("event not published: ", ""), ) .for_stderr() .red() .to_string(), ); failed = true; break; } }; } if !failed { pb.set_style(pb_after_style_succeeded.clone()); pb.finish_with_message(""); } })) .await; Ok(()) } /// returns `(unique_vec1, unique_vec2, duplicates, all)` fn unique_and_duplicate_all<'a, S>( vec1: &'a Vec, vec2: &'a Vec, ) -> (Vec<&'a S>, Vec<&'a S>, Vec<&'a S>, Vec<&'a S>) where S: PartialEq, { let mut vec1_u = vec![]; let mut vec2_u = vec![]; let mut dup = vec![]; let mut all = vec![]; for s1 in vec1 { if vec2.iter().any(|s2| s1.eq(s2)) { dup.push(s1); } else { vec1_u.push(s1); } } for s2 in vec2 { if !vec1.iter().any(|s1| s2.eq(s1)) { vec2_u.push(s2); } } for a in [&dup, &vec1_u, &vec2_u] { for e in a { all.push(&**e); } } (vec1_u, vec2_u, dup, all) } mod tests_unique_and_duplicate { #[test] fn correct_number_of_unique_and_duplicate_items() { let v1 = vec![ "t1".to_string(), "t2".to_string(), "t3".to_string(), "t4".to_string(), "t5".to_string(), ]; let v2 = vec![ "t3".to_string(), "t4".to_string(), "t5".to_string(), "t6".to_string(), ]; let (v1_u, v2_u, d, a) = super::unique_and_duplicate_all(&v1, &v2); assert_eq!(v1_u.len(), 2); assert_eq!(v2_u.len(), 1); assert_eq!(d.len(), 3); assert_eq!(a.len(), 6); } #[test] fn all_begins_with_duplicates() { let v1 = vec![ "t1".to_string(), "t2".to_string(), "t3".to_string(), "t4".to_string(), "t5".to_string(), ]; let v2 = vec![ "t3".to_string(), "t4".to_string(), "t5".to_string(), "t6".to_string(), ]; let (_, _, d, a) = super::unique_and_duplicate_all(&v1, &v2); assert_eq!(a[0], d[0]); } } pub static PR_KIND: u64 = 318; pub static PATCH_KIND: u64 = 317; pub fn generate_pr_and_patch_events( title: &str, description: &str, to_branch: &str, git_repo: &Repo, commits: &Vec, keys: &nostr::Keys, ) -> Result> { let root_commit = git_repo .get_root_commit(to_branch) .context("failed to get root commit of the repository")?; let mut pr_tags = vec![ Tag::Reference(format!("r-{root_commit}")), Tag::Name(title.to_string()), Tag::Description(description.to_string()), ]; if let Ok(branch_name) = git_repo.get_checked_out_branch_name() { pr_tags.push(Tag::Generic( TagKind::Custom("branch-name".to_string()), vec![branch_name], )); } let pr_event = EventBuilder::new( nostr::event::Kind::Custom(PR_KIND), format!("{title}\r\n\r\n{description}"), &pr_tags, // TODO: add Repo event as root // TODO: people tag maintainers // TODO: add relay tags ) .to_event(keys) .context("failed to create pr event")?; let pr_event_id = pr_event.id; let mut events = vec![pr_event]; for commit in commits { events.push( generate_patch_event(git_repo, &root_commit, commit, pr_event_id, keys) .context("failed to generate patch event")?, ); } Ok(events) } pub fn generate_patch_event( git_repo: &Repo, root_commit: &Sha1Hash, commit: &Sha1Hash, pr_event_id: nostr::EventId, keys: &nostr::Keys, ) -> Result { let commit_parent = git_repo .get_commit_parent(commit) .context("failed to get parent commit")?; EventBuilder::new( nostr::event::Kind::Custom(PATCH_KIND), git_repo .make_patch_from_commit(commit) .context(format!("cannot make patch for commit {commit}"))?, &[ Tag::Reference(format!("r-{root_commit}")), Tag::Reference(commit.to_string()), Tag::Reference(commit_parent.to_string()), Tag::Event( pr_event_id, None, // TODO: add relay Some(Marker::Root), ), Tag::Generic( TagKind::Custom("commit".to_string()), vec![commit.to_string()], ), Tag::Generic( TagKind::Custom("parent-commit".to_string()), vec![commit_parent.to_string()], ), Tag::Generic( TagKind::Custom("commit-sig".to_string()), vec![ git_repo .extract_commit_pgp_signature(commit) .unwrap_or_default(), ], ), Tag::Description(git_repo.get_commit_message(commit)?.to_string()), Tag::Generic( TagKind::Custom("author".to_string()), git_repo.get_commit_author(commit)?, ), Tag::Generic( TagKind::Custom("committer".to_string()), git_repo.get_commit_comitter(commit)?, ), // TODO: add Repo event tags // TODO: people tag maintainers // TODO: add relay tags ], ) .to_event(keys) .context("failed to sign event") } // TODO // - find profile // - file relays // - find repo events // - /** * returns `(from_branch,to_branch,ahead,behind)` */ fn identify_ahead_behind( git_repo: &Repo, from_branch: &Option, to_branch: &Option, ) -> Result<(String, String, Vec, Vec)> { let (from_branch, from_tip) = match from_branch { Some(name) => ( name.to_string(), git_repo .get_tip_of_local_branch(name) .context(format!("cannot find from_branch '{name}'"))?, ), None => ( "head".to_string(), git_repo .get_head_commit() .context("failed to get head commit") .context( "checkout a commit or specify a from_branch. head does not reveal a commit", )?, ), }; let (to_branch, to_tip) = match to_branch { Some(name) => ( name.to_string(), git_repo .get_tip_of_local_branch(name) .context(format!("cannot find to_branch '{name}'"))?, ), None => { let (name, commit) = git_repo .get_main_or_master_branch() .context("a destination branch (to_branch) is not specified and the defaults (main or master) do not exist")?; (name.to_string(), commit) } }; match git_repo.get_commits_ahead_behind(&to_tip, &from_tip) { Err(e) => { if e.to_string().contains("is not an ancestor of") { return Err(e).context(format!( "'{from_branch}' is not branched from '{to_branch}'" )); } Err(e).context(format!( "failed to get commits ahead and behind from '{from_branch}' to '{to_branch}'" )) } Ok((ahead, behind)) => Ok((from_branch, to_branch, ahead, behind)), } } #[cfg(test)] mod tests { use test_utils::git::GitTestRepo; use super::*; mod identify_ahead_behind { use super::*; use crate::git::oid_to_sha1; #[test] fn when_from_branch_doesnt_exist_return_error() -> Result<()> { let test_repo = GitTestRepo::default(); let git_repo = Repo::from_path(&test_repo.dir)?; test_repo.populate()?; let branch_name = "doesnt_exist"; assert_eq!( identify_ahead_behind(&git_repo, &Some(branch_name.to_string()), &None) .unwrap_err() .to_string(), format!("cannot find from_branch '{}'", &branch_name), ); Ok(()) } #[test] fn when_to_branch_doesnt_exist_return_error() -> Result<()> { let test_repo = GitTestRepo::default(); let git_repo = Repo::from_path(&test_repo.dir)?; test_repo.populate()?; let branch_name = "doesnt_exist"; assert_eq!( identify_ahead_behind(&git_repo, &None, &Some(branch_name.to_string())) .unwrap_err() .to_string(), format!("cannot find to_branch '{}'", &branch_name), ); Ok(()) } #[test] fn when_to_branch_is_none_and_no_main_or_master_branch_return_error() -> Result<()> { let test_repo = GitTestRepo::new("notmain")?; let git_repo = Repo::from_path(&test_repo.dir)?; test_repo.populate()?; assert_eq!( identify_ahead_behind(&git_repo, &None, &None) .unwrap_err() .to_string(), "a destination branch (to_branch) is not specified and the defaults (main or master) do not exist", ); Ok(()) } #[test] fn when_from_branch_is_none_return_as_head() -> Result<()> { let test_repo = GitTestRepo::default(); let git_repo = Repo::from_path(&test_repo.dir)?; test_repo.populate()?; // create feature branch with 1 commit ahead test_repo.create_branch("feature")?; test_repo.checkout("feature")?; std::fs::write(test_repo.dir.join("t3.md"), "some content")?; let head_oid = test_repo.stage_and_commit("add t3.md")?; // make feature branch 1 commit behind test_repo.checkout("main")?; std::fs::write(test_repo.dir.join("t4.md"), "some content")?; let main_oid = test_repo.stage_and_commit("add t4.md")?; // checkout feature test_repo.checkout("feature")?; let (from_branch, to_branch, ahead, behind) = identify_ahead_behind(&git_repo, &None, &None)?; assert_eq!(from_branch, "head"); assert_eq!(ahead, vec![oid_to_sha1(&head_oid)]); assert_eq!(to_branch, "main"); assert_eq!(behind, vec![oid_to_sha1(&main_oid)]); Ok(()) } #[test] fn when_from_branch_is_not_head_return_as_from_branch() -> Result<()> { let test_repo = GitTestRepo::default(); let git_repo = Repo::from_path(&test_repo.dir)?; test_repo.populate()?; // create feature branch with 1 commit ahead test_repo.create_branch("feature")?; test_repo.checkout("feature")?; std::fs::write(test_repo.dir.join("t3.md"), "some content")?; let head_oid = test_repo.stage_and_commit("add t3.md")?; // make feature branch 1 commit behind test_repo.checkout("main")?; std::fs::write(test_repo.dir.join("t4.md"), "some content")?; let main_oid = test_repo.stage_and_commit("add t4.md")?; let (from_branch, to_branch, ahead, behind) = identify_ahead_behind(&git_repo, &Some("feature".to_string()), &None)?; assert_eq!(from_branch, "feature"); assert_eq!(ahead, vec![oid_to_sha1(&head_oid)]); assert_eq!(to_branch, "main"); assert_eq!(behind, vec![oid_to_sha1(&main_oid)]); Ok(()) } #[test] fn when_to_branch_is_not_main_return_as_to_branch() -> Result<()> { let test_repo = GitTestRepo::default(); let git_repo = Repo::from_path(&test_repo.dir)?; test_repo.populate()?; // create dev branch with 1 commit ahead test_repo.create_branch("dev")?; test_repo.checkout("dev")?; std::fs::write(test_repo.dir.join("t3.md"), "some content")?; let dev_oid_first = test_repo.stage_and_commit("add t3.md")?; // create feature branch with 1 commit ahead of dev test_repo.create_branch("feature")?; test_repo.checkout("feature")?; std::fs::write(test_repo.dir.join("t4.md"), "some content")?; let feature_oid = test_repo.stage_and_commit("add t4.md")?; // make feature branch 1 behind test_repo.checkout("dev")?; std::fs::write(test_repo.dir.join("t3.md"), "some content")?; let dev_oid = test_repo.stage_and_commit("add t3.md")?; let (from_branch, to_branch, ahead, behind) = identify_ahead_behind( &git_repo, &Some("feature".to_string()), &Some("dev".to_string()), )?; assert_eq!(from_branch, "feature"); assert_eq!(ahead, vec![oid_to_sha1(&feature_oid)]); assert_eq!(to_branch, "dev"); assert_eq!(behind, vec![oid_to_sha1(&dev_oid)]); let (from_branch, to_branch, ahead, behind) = identify_ahead_behind(&git_repo, &Some("feature".to_string()), &None)?; assert_eq!(from_branch, "feature"); assert_eq!( ahead, vec![oid_to_sha1(&feature_oid), oid_to_sha1(&dev_oid_first)] ); assert_eq!(to_branch, "main"); assert_eq!(behind, vec![]); Ok(()) } } }