fix(list): support `--in-reply-to` latest revision

update list to support rebases via proposal revisions
as created by `ngit send --in-reply-to`
or upcoming change `ngit push --force`

1 files changed, 308 insertions, 3 deletions

diff --git a/tests/list.rs b/tests/list.rs
index 7762b1c..eb6dc3d 100644
--- a/tests/list.rs
+++ b/tests/list.rs
@@ -1,5 +1,6 @@
 use anyhow::Result;
 use futures::join;
+use nostr_sdk::client::blocking::Client;
 use serial_test::serial;
 use test_utils::{git::GitTestRepo, relay::Relay, *};
 
@@ -20,18 +21,21 @@ fn cli_tester_create_proposals() -> Result<GitTestRepo> {
         FEATURE_BRANCH_NAME_1,
         "a",
         Some((PROPOSAL_TITLE_1, "proposal a description")),
+        None,
     )?;
     cli_tester_create_proposal(
         &git_repo,
         FEATURE_BRANCH_NAME_2,
         "b",
         Some((PROPOSAL_TITLE_2, "proposal b description")),
+        None,
     )?;
     cli_tester_create_proposal(
         &git_repo,
         FEATURE_BRANCH_NAME_3,
         "c",
         Some((PROPOSAL_TITLE_3, "proposal c description")),
+        None,
     )?;
     Ok(git_repo)
 }
@@ -65,10 +69,27 @@ fn cli_tester_create_proposal(
     branch_name: &str,
     prefix: &str,
     cover_letter_title_and_description: Option<(&str, &str)>,
+    in_reply_to: Option<String>,
 ) -> Result<()> {
     create_and_populate_branch(test_repo, branch_name, prefix, false)?;
 
-    if let Some((title, description)) = cover_letter_title_and_description {
+    if let Some(in_reply_to) = in_reply_to {
+        let mut p = CliTester::new_from_dir(
+            &test_repo.dir,
+            [
+                "--nsec",
+                TEST_KEY_1_NSEC,
+                "--password",
+                TEST_PASSWORD,
+                "--disable-cli-spinners",
+                "send",
+                "--no-cover-letter",
+                "--in-reply-to",
+                in_reply_to.as_str(),
+            ],
+        );
+        p.expect_end_eventually()?;
+    } else if let Some((title, description)) = cover_letter_title_and_description {
         let mut p = CliTester::new_from_dir(
             &test_repo.dir,
             [
@@ -636,6 +657,7 @@ mod when_main_branch_is_uptodate {
                                 FEATURE_BRANCH_NAME_4,
                                 "d",
                                 None,
+                                None,
                             )?;
                             let test_repo = GitTestRepo::default();
                             test_repo.populate()?;
@@ -715,6 +737,7 @@ mod when_main_branch_is_uptodate {
                                 FEATURE_BRANCH_NAME_4,
                                 "d",
                                 None,
+                                None,
                             )?;
                             let test_repo = GitTestRepo::default();
                             test_repo.populate()?;
@@ -1193,8 +1216,290 @@ mod when_main_branch_is_uptodate {
             }
 
             mod when_latest_event_rebases_branch {
-                // use super::*;
-                // TODO
+                use std::time::Duration;
+
+                use super::*;
+
+                async fn prep_and_run() -> Result<(GitTestRepo, GitTestRepo)> {
+                    // fallback (51,52) user write (53, 55) repo (55, 56)
+                    let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
+                        Relay::new(8051, None, None),
+                        Relay::new(8052, None, None),
+                        Relay::new(8053, None, None),
+                        Relay::new(8055, None, None),
+                        Relay::new(8056, None, None),
+                    );
+
+                    r51.events.push(generate_test_key_1_relay_list_event());
+                    r51.events.push(generate_test_key_1_metadata_event("fred"));
+                    r51.events.push(generate_repo_ref_event());
+
+                    r55.events.push(generate_repo_ref_event());
+                    r55.events.push(generate_test_key_1_metadata_event("fred"));
+                    r55.events.push(generate_test_key_1_relay_list_event());
+
+                    let cli_tester_handle = std::thread::spawn(
+                        move || -> Result<(GitTestRepo, GitTestRepo)> {
+                            // create 3 proposals
+                            let _ = cli_tester_create_proposals()?;
+                            // get proposal id of first
+                            let client = Client::new(&nostr::Keys::generate());
+                            client.add_relay("ws://localhost:8055")?;
+                            client.connect_relay("ws://localhost:8055")?;
+                            let proposals = client.get_events_of(
+                                vec![
+                                    nostr::Filter::default()
+                                        .kind(nostr::Kind::Custom(PATCH_KIND))
+                                        .custom_tag(nostr::Alphabet::T, vec!["root"]),
+                                ],
+                                Some(Duration::from_millis(500)),
+                            )?;
+                            client.disconnect()?;
+
+                            let proposal_1_id = proposals
+                                .iter()
+                                .find(|e| {
+                                    e.tags
+                                        .iter()
+                                        .any(|t| t.as_vec()[1].eq(&FEATURE_BRANCH_NAME_1))
+                                })
+                                .unwrap()
+                                .id;
+                            // recreate proposal 1 on top of a another commit (like a rebase on top
+                            // of one extra commit)
+                            let second_originating_repo = GitTestRepo::default();
+                            second_originating_repo.populate()?;
+                            std::fs::write(
+                                second_originating_repo.dir.join("amazing.md"),
+                                "some content",
+                            )?;
+                            second_originating_repo
+                                .stage_and_commit("commit for rebasing on top of")?;
+                            cli_tester_create_proposal(
+                                &second_originating_repo,
+                                FEATURE_BRANCH_NAME_1,
+                                "a",
+                                Some((PROPOSAL_TITLE_1, "proposal a description")),
+                                Some(proposal_1_id.to_string()),
+                            )?;
+
+                            // pretend we have downloaded the origianl version of the first proposal
+                            let test_repo = GitTestRepo::default();
+                            test_repo.populate()?;
+                            create_and_populate_branch(
+                                &test_repo,
+                                FEATURE_BRANCH_NAME_1,
+                                "a",
+                                false,
+                            )?;
+                            // pretend we have pulled the updated main branch
+                            test_repo.checkout("main")?;
+                            std::fs::write(test_repo.dir.join("amazing.md"), "some content")?;
+                            test_repo.stage_and_commit("commit for rebasing on top of")?;
+
+                            let mut p = CliTester::new_from_dir(&test_repo.dir, ["list"]);
+                            p.expect("finding proposals...\r\n")?;
+                            let mut c = p.expect_choice(
+                                "all proposals",
+                                vec![
+                                    format!("\"{PROPOSAL_TITLE_1}\""),
+                                    format!("\"{PROPOSAL_TITLE_2}\""),
+                                    format!("\"{PROPOSAL_TITLE_3}\""),
+                                ],
+                            )?;
+                            c.succeeds_with(0, true, None)?;
+                            p.expect("finding commits...\r\n")?;
+                            p.expect("updated proposal available (2 ahead 0 behind 'main'). existing version is 2 ahead 1 behind 'main'\r\n")?;
+                            // its got here but tmpgit-32.. indicates that creatubg the eature
+                            // branch in line 1291 didnt work so the choices will be different
+                            let mut c = p.expect_choice(
+                                "",
+                                vec![
+                                    format!("checkout and overwrite existing proposal branch"),
+                                    format!("checkout existing outdated proposal branch"),
+                                    format!("apply to current branch with `git am`"),
+                                    format!("download to ./patches"),
+                                    format!("back"),
+                                ],
+                            )?;
+                            c.succeeds_with(0, false, Some(0))?;
+                            p.expect("checked out new version of proposal (2 ahead 0 behind 'main'), replacing old version (2 ahead 1 behind 'main')\r\n")?;
+                            p.expect_end()?;
+
+                            for p in [51, 52, 53, 55, 56] {
+                                relay::shutdown_relay(8000 + p)?;
+                            }
+                            Ok((second_originating_repo, test_repo))
+                        },
+                    );
+
+                    // launch relay
+                    let _ = join!(
+                        r51.listen_until_close(),
+                        r52.listen_until_close(),
+                        r53.listen_until_close(),
+                        r55.listen_until_close(),
+                        r56.listen_until_close(),
+                    );
+                    let res = cli_tester_handle.join().unwrap()?;
+
+                    Ok(res)
+                }
+
+                mod cli_prompts {
+                    use super::*;
+                    async fn run_async_prompts_to_choose_from_proposal_titles() -> Result<()> {
+                        let (mut r51, mut r52, mut r53, mut r55, mut r56) = (
+                            Relay::new(8051, None, None),
+                            Relay::new(8052, None, None),
+                            Relay::new(8053, None, None),
+                            Relay::new(8055, None, None),
+                            Relay::new(8056, None, None),
+                        );
+
+                        r51.events.push(generate_test_key_1_relay_list_event());
+                        r51.events.push(generate_test_key_1_metadata_event("fred"));
+                        r51.events.push(generate_repo_ref_event());
+
+                        r55.events.push(generate_repo_ref_event());
+                        r55.events.push(generate_test_key_1_metadata_event("fred"));
+                        r55.events.push(generate_test_key_1_relay_list_event());
+
+                        let cli_tester_handle = std::thread::spawn(move || -> Result<()> {
+                            // create 3 proposals
+                            let _ = cli_tester_create_proposals()?;
+                            // get proposal id of first
+                            let client = Client::new(&nostr::Keys::generate());
+                            client.add_relay("ws://localhost:8055")?;
+                            client.connect_relay("ws://localhost:8055")?;
+                            let proposals = client.get_events_of(
+                                vec![
+                                    nostr::Filter::default()
+                                        .kind(nostr::Kind::Custom(PATCH_KIND))
+                                        .custom_tag(nostr::Alphabet::T, vec!["root"]),
+                                ],
+                                Some(Duration::from_millis(500)),
+                            )?;
+                            client.disconnect()?;
+
+                            let proposal_1_id = proposals
+                                .iter()
+                                .find(|e| {
+                                    e.tags
+                                        .iter()
+                                        .any(|t| t.as_vec()[1].eq(&FEATURE_BRANCH_NAME_1))
+                                })
+                                .unwrap()
+                                .id;
+                            // recreate proposal 1 on top of a another commit (like a rebase on top
+                            // of one extra commit)
+                            let second_originating_repo = GitTestRepo::default();
+                            second_originating_repo.populate()?;
+                            std::fs::write(
+                                second_originating_repo.dir.join("amazing.md"),
+                                "some content",
+                            )?;
+                            second_originating_repo
+                                .stage_and_commit("commit for rebasing on top of")?;
+                            cli_tester_create_proposal(
+                                &second_originating_repo,
+                                FEATURE_BRANCH_NAME_1,
+                                "a",
+                                Some((PROPOSAL_TITLE_1, "proposal a description")),
+                                Some(proposal_1_id.to_string()),
+                            )?;
+
+                            // pretend we have downloaded the origianl version of the first proposal
+                            let test_repo = GitTestRepo::default();
+                            test_repo.populate()?;
+                            create_and_populate_branch(
+                                &test_repo,
+                                FEATURE_BRANCH_NAME_1,
+                                "a",
+                                false,
+                            )?;
+                            // pretend we have pulled the updated main branch
+                            test_repo.checkout("main")?;
+                            std::fs::write(test_repo.dir.join("amazing.md"), "some content")?;
+                            test_repo.stage_and_commit("commit for rebasing on top of")?;
+
+                            let mut p = CliTester::new_from_dir(&test_repo.dir, ["list"]);
+                            p.expect("finding proposals...\r\n")?;
+                            let mut c = p.expect_choice(
+                                "all proposals",
+                                vec![
+                                    format!("\"{PROPOSAL_TITLE_1}\""),
+                                    format!("\"{PROPOSAL_TITLE_2}\""),
+                                    format!("\"{PROPOSAL_TITLE_3}\""),
+                                ],
+                            )?;
+                            c.succeeds_with(0, true, None)?;
+                            p.expect("finding commits...\r\n")?;
+                            p.expect("updated proposal available (2 ahead 0 behind 'main'). existing version is 2 ahead 1 behind 'main'\r\n")?;
+                            // its got here but tmpgit-32.. indicates that creatubg the eature
+                            // branch in line 1291 didnt work so the choices will be different
+                            let mut c = p.expect_choice(
+                                "",
+                                vec![
+                                    format!("checkout and overwrite existing proposal branch"),
+                                    format!("checkout existing outdated proposal branch"),
+                                    format!("apply to current branch with `git am`"),
+                                    format!("download to ./patches"),
+                                    format!("back"),
+                                ],
+                            )?;
+                            c.succeeds_with(0, false, Some(0))?;
+                            p.expect("checked out new version of proposal (2 ahead 0 behind 'main'), replacing old version (2 ahead 1 behind 'main')\r\n")?;
+                            p.expect_end()?;
+
+                            for p in [51, 52, 53, 55, 56] {
+                                relay::shutdown_relay(8000 + p)?;
+                            }
+                            Ok(())
+                        });
+
+                        // launch relay
+                        let _ = join!(
+                            r51.listen_until_close(),
+                            r52.listen_until_close(),
+                            r53.listen_until_close(),
+                            r55.listen_until_close(),
+                            r56.listen_until_close(),
+                        );
+                        cli_tester_handle.join().unwrap()?;
+                        println!("{:?}", r55.events);
+                        Ok(())
+                    }
+
+                    #[tokio::test]
+                    #[serial]
+                    async fn prompts_to_choose_from_proposal_titles() -> Result<()> {
+                        let _ = run_async_prompts_to_choose_from_proposal_titles().await;
+                        Ok(())
+                    }
+                }
+
+                #[tokio::test]
+                #[serial]
+                async fn proposal_branch_checked_out() -> Result<()> {
+                    let (_, test_repo) = prep_and_run().await?;
+                    assert_eq!(
+                        FEATURE_BRANCH_NAME_1,
+                        test_repo.get_checked_out_branch_name()?,
+                    );
+                    Ok(())
+                }
+
+                #[tokio::test]
+                #[serial]
+                async fn proposal_branch_tip_is_most_recent_proposal_revision_tip() -> Result<()> {
+                    let (originating_repo, test_repo) = prep_and_run().await?;
+                    assert_eq!(
+                        originating_repo.get_tip_of_local_branch(FEATURE_BRANCH_NAME_1)?,
+                        test_repo.get_tip_of_local_branch(FEATURE_BRANCH_NAME_1)?,
+                    );
+                    Ok(())
+                }
             }
         }
     }