upleb.uk

Public git repos — served from a NIP-34 GRASP relay at git.upleb.uk

summaryrefslogtreecommitdiff
path: root/src/bin/ngit/sub_commands/send.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/bin/ngit/sub_commands/send.rs')
-rw-r--r--src/bin/ngit/sub_commands/send.rs25
1 files changed, 14 insertions, 11 deletions
diff --git a/src/bin/ngit/sub_commands/send.rs b/src/bin/ngit/sub_commands/send.rs
index 05054fd..3ae941f 100644
--- a/src/bin/ngit/sub_commands/send.rs
+++ b/src/bin/ngit/sub_commands/send.rs
@@ -3,7 +3,9 @@ use std::{path::Path, str::FromStr, thread, time::Duration};
3use anyhow::{Context, Result, bail}; 3use anyhow::{Context, Result, bail};
4use console::Style; 4use console::Style;
5use ngit::{ 5use ngit::{
6 cli_interactor::{PromptChoiceParms, multi_select_with_custom_value}, 6 cli_interactor::{
7 PromptChoiceParms, multi_select_with_custom_value, show_multi_input_prompt_success,
8 },
7 client::{Params, send_events}, 9 client::{Params, send_events},
8 git::nostr_url::CloneUrl, 10 git::nostr_url::CloneUrl,
9 git_events::{ 11 git_events::{
@@ -343,12 +345,13 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs, no_fetch: bool) -> Re
343 .collect(); 345 .collect();
344 let selections = vec![true; default_choices.len()]; // all selected by default 346 let selections = vec![true; default_choices.len()]; // all selected by default
345 let grasp_servers = multi_select_with_custom_value( 347 let grasp_servers = multi_select_with_custom_value(
346 "grasp server(s)", 348 "alternative grasp server(s)",
347 "grasp server", 349 "grasp server",
348 default_choices, 350 default_choices,
349 selections, 351 selections,
350 normalize_grasp_server_url, 352 normalize_grasp_server_url,
351 )?; 353 )?;
354 show_multi_input_prompt_success("alternative grasp server(s)", &grasp_servers);
352 if grasp_servers.is_empty() { 355 if grasp_servers.is_empty() {
353 // ask again 356 // ask again
354 continue; 357 continue;
@@ -388,16 +391,16 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs, no_fetch: bool) -> Re
388 } 391 }
389 normalised_grasp_servers 392 normalised_grasp_servers
390 } else { 393 } else {
391 println!(
392 "{} personal-fork so we can push commits to your prefered grasp servers",
393 if user_repo_ref.is_some() {
394 "Updating"
395 } else {
396 "Creating a"
397 },
398 );
399 untried_user_grasp_servers 394 untried_user_grasp_servers
400 }; 395 };
396 println!(
397 "{} personal-fork so we can push commits to your prefered grasp servers",
398 if user_repo_ref.is_some() {
399 "Updating"
400 } else {
401 "Creating a"
402 },
403 );
401 404
402 let grasp_servers_as_personal_clone_url: Vec<String> = grasp_servers 405 let grasp_servers_as_personal_clone_url: Vec<String> = grasp_servers
403 .iter() 406 .iter()
@@ -415,7 +418,7 @@ pub async fn launch(cli_args: &Cli, args: &SubCommandArgs, no_fetch: bool) -> Re
415 let updated_user_repo_ref = { 418 let updated_user_repo_ref = {
416 if let Some(mut user_repo_ref) = user_repo_ref { 419 if let Some(mut user_repo_ref) = user_repo_ref {
417 for g in &grasp_servers_as_personal_clone_url { 420 for g in &grasp_servers_as_personal_clone_url {
418 let _ = user_repo_ref.add_grasp_server(g); 421 user_repo_ref.add_grasp_server(g)?;
419 } 422 }
420 user_repo_ref 423 user_repo_ref
421 } else { 424 } else {