upleb.uk

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

summaryrefslogtreecommitdiff
path: root/src/sub_commands/list.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/sub_commands/list.rs')
-rw-r--r--src/sub_commands/list.rs14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/sub_commands/list.rs b/src/sub_commands/list.rs
index 7f0622e..666c4bf 100644
--- a/src/sub_commands/list.rs
+++ b/src/sub_commands/list.rs
@@ -370,7 +370,7 @@ pub async fn launch(_cli_args: &Cli, _args: &SubCommandArgs) -> Result<()> {
370 } 370 }
371 371
372 // new proposal revision / rebase 372 // new proposal revision / rebase
373 // tip of local in proposal history (new, ammended or rebased version but no 373 // tip of local in proposal history (new, amended or rebased version but no
374 // local changes) 374 // local changes)
375 if commits_events.iter().any(|patch| { 375 if commits_events.iter().any(|patch| {
376 get_commit_id_from_patch(patch) 376 get_commit_id_from_patch(patch)
@@ -477,21 +477,21 @@ pub async fn launch(_cli_args: &Cli, _args: &SubCommandArgs) -> Result<()> {
477 }; 477 };
478 } 478 }
479 479
480 println!("you have an ammended/rebase version the proposal that is unpublished"); 480 println!("you have an amended/rebase version the proposal that is unpublished");
481 // user probably has a unpublished ammended or rebase version of the latest 481 // user probably has a unpublished amended or rebase version of the latest
482 // proposal version 482 // proposal version
483 // if tip of proposal commits exist (were once part of branch but have been 483 // if tip of proposal commits exist (were once part of branch but have been
484 // ammended and git clean up job hasn't removed them) 484 // amended and git clean up job hasn't removed them)
485 if git_repo.does_commit_exist(&proposal_tip.to_string())? { 485 if git_repo.does_commit_exist(&proposal_tip.to_string())? {
486 println!( 486 println!(
487 "you have previously applied the latest version of the proposal ({} ahead {} behind '{main_branch_name}') but your local proposal branch has ammended or rebased it ({} ahead {} behind '{main_branch_name}')", 487 "you have previously applied the latest version of the proposal ({} ahead {} behind '{main_branch_name}') but your local proposal branch has amended or rebased it ({} ahead {} behind '{main_branch_name}')",
488 most_recent_proposal_patch_chain.len(), 488 most_recent_proposal_patch_chain.len(),
489 proposal_behind_main.len(), 489 proposal_behind_main.len(),
490 local_ahead_of_main.len(), 490 local_ahead_of_main.len(),
491 local_beind_main.len(), 491 local_beind_main.len(),
492 ); 492 );
493 } 493 }
494 // user probably has a unpublished ammended or rebase version of an older 494 // user probably has a unpublished amended or rebase version of an older
495 // proposal version 495 // proposal version
496 else { 496 else {
497 println!( 497 println!(
@@ -503,7 +503,7 @@ pub async fn launch(_cli_args: &Cli, _args: &SubCommandArgs) -> Result<()> {
503 ); 503 );
504 504
505 println!( 505 println!(
506 "its likely that you have rebased / ammended an old proposal version because git has no record of the latest proposal commit." 506 "its likely that you have rebased / amended an old proposal version because git has no record of the latest proposal commit."
507 ); 507 );
508 println!( 508 println!(
509 "it is possible that you have been working off the latest version and git has delete this commit as part of a clean up" 509 "it is possible that you have been working off the latest version and git has delete this commit as part of a clean up"