From 79896914357ee322b08b302c3dde08c7a24a0a09 Mon Sep 17 00:00:00 2001
From: DanConwayDev <DanConwayDev@protonmail.com>
Date: Thu, 22 Feb 2024 12:15:46 +0000
Subject: feat(list): improved copy for rebase scenarios

and added some comments to better describe the rebase scenarios
---
 src/sub_commands/list.rs | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

(limited to 'src')

diff --git a/src/sub_commands/list.rs b/src/sub_commands/list.rs
index 88ad52f..fbf04a9 100644
--- a/src/sub_commands/list.rs
+++ b/src/sub_commands/list.rs
@@ -436,7 +436,9 @@ pub async fn launch(_cli_args: &Cli, _args: &SubCommandArgs) -> Result<()> {
             };
         }
 
-        // tip of proposal in branch in history (local appendments made)
+        // TODO: write tests
+        // tip of proposal in branch in history (local appendments made to up-to-date
+        // proposal)
         if let Ok((local_ahead_of_proposal, _)) =
             git_repo.get_commits_ahead_behind(&proposal_tip, &local_branch_tip)
         {
@@ -474,6 +476,8 @@ pub async fn launch(_cli_args: &Cli, _args: &SubCommandArgs) -> Result<()> {
             };
         }
 
+        // TODO: write tests
+        // user has probably has an unpublished rebase of the latest proposal version
         // if tip of proposal commits exist (were once part of branch but have been
         // ammended and git clean up job hasn't removed them)
         if git_repo.does_commit_exist(&proposal_tip.to_string())? {
@@ -484,6 +488,9 @@ pub async fn launch(_cli_args: &Cli, _args: &SubCommandArgs) -> Result<()> {
                 local_ahead_of_main.len(),
                 local_beind_main.len(),
             );
+            println!(
+                "if this sounds right then consider publishing your rebase `ngit push --force` or discarding your local branch"
+            );
             return match Interactor::default().choice(
                 PromptChoiceParms::default().with_default(0)
                     .with_choices(
@@ -540,6 +547,9 @@ pub async fn launch(_cli_args: &Cli, _args: &SubCommandArgs) -> Result<()> {
             };
         }
 
+        // TODO: write tests
+        // user has probaly has an unpublished rebase of an older version of the
+        // proposal
         println!(
             "your local proposal branch ({} ahead {} behind '{main_branch_name}') has conflicting changes with the latest published proposal ({} ahead {} behind '{main_branch_name}')",
             local_ahead_of_main.len(),
@@ -547,6 +557,19 @@ pub async fn launch(_cli_args: &Cli, _args: &SubCommandArgs) -> Result<()> {
             most_recent_proposal_patch_chain.len(),
             proposal_behind_main.len(),
         );
+        println!(
+            "its likely that you are working off an old proposal version because git has no record of the latest proposal commit."
+        );
+        println!(
+            "it is possible that you have ammended the latest version and git has delete this commit as part of a clean up"
+        );
+
+        println!("to view the latest proposal but retain your changes:");
+        println!("  1) checkout the local branch");
+        println!("  2) create a new branch off the tip commit to store your changes");
+        println!("  3) run `ngit list` and checkout the latest published version of this proposal");
+
+        println!("if you are confident in your changes consider running `ngit push --force`");
 
         return match Interactor::default().choice(
                 PromptChoiceParms::default().with_default(0)
-- 
cgit v1.2.3