fix(remote): update copy

to make it more like native git

3 files changed, 11 insertions, 53 deletions

diff --git a/tests/git_remote_nostr/fetch.rs b/tests/git_remote_nostr/fetch.rs
index b7415b5..066e104 100644
--- a/tests/git_remote_nostr/fetch.rs
+++ b/tests/git_remote_nostr/fetch.rs
@@ -42,7 +42,7 @@ async fn fetch_downloads_speficied_commits_from_git_server() -> Result<()> {
         p.send_line(format!("fetch {main_commit_id} main").as_str())?;
         p.send_line(format!("fetch {vnext_commit_id} vnext").as_str())?;
         p.send_line("")?;
-        p.expect(format!("fetching over filesystem from {source_path}...\r\n").as_str())?;
+        p.expect(format!("fetching {source_path} over filesystem...\r\n").as_str())?;
         p.expect_eventually_and_print("\r\n")?;
 
         assert!(git_repo.git_repo.find_commit(main_commit_id).is_ok());
@@ -108,7 +108,7 @@ mod when_first_git_server_fails_ {
             let mut p = cli_tester_after_fetch(&git_repo)?;
             p.send_line(format!("fetch {main_commit_id} main").as_str())?;
             p.send_line("")?;
-            p.expect(format!("fetching over filesystem from {error_path}...\r\n").as_str())?;
+            p.expect(format!("fetching {error_path} over filesystem...\r\n").as_str())?;
             // not sure why the below isn't appearing
             // p.expect(format!("fetching over filesystem from
             // {source_path}...\r\n").as_str())?;
@@ -166,7 +166,7 @@ async fn creates_commits_from_open_proposal_with_no_warngins_printed() -> Result
         let mut p = cli_tester_after_fetch(&git_repo)?;
         p.send_line(format!("fetch {proposal_tip} refs/heads/{branch_name}").as_str())?;
         p.send_line("")?;
-        p.expect(format!("fetching over filesystem from {source_path}...\r\n").as_str())?;
+        p.expect(format!("fetching {source_path} over filesystem...\r\n").as_str())?;
         // expect no errors
         p.expect_after_whitespace("\r\n")?;
         p.exit()?;
diff --git a/tests/git_remote_nostr/list.rs b/tests/git_remote_nostr/list.rs
index 3858ece..0753a24 100644
--- a/tests/git_remote_nostr/list.rs
+++ b/tests/git_remote_nostr/list.rs
@@ -41,13 +41,7 @@ mod without_state_announcement {
         let cli_tester_handle = std::thread::spawn(move || -> Result<()> {
             let mut p = cli_tester_after_fetch(&git_repo)?;
             p.send_line("list")?;
-            p.expect(
-                format!(
-                    "fetching ref list over filesystem from {}...\r\n",
-                    source_path
-                )
-                .as_str(),
-            )?;
+            p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?;
             // println!("{}", p.expect_eventually("\r\n\r\n")?);
             let res = p.expect_eventually("\r\n\r\n")?;
             p.exit()?;
@@ -121,11 +115,7 @@ mod with_state_announcement {
                 let mut p = cli_tester_after_fetch(&git_repo)?;
                 p.send_line("list")?;
                 p.expect(
-                    format!(
-                        "fetching ref list over filesystem from {}...\r\n",
-                        source_path
-                    )
-                    .as_str(),
+                    format!("fetching {} ref list over filesystem...\r\n", source_path).as_str(),
                 )?;
                 // println!("{}", p.expect_eventually("\r\n\r\n")?);
                 let res = p.expect_eventually("\r\n\r\n")?;
@@ -208,11 +198,7 @@ mod with_state_announcement {
                 let mut p = cli_tester_after_fetch(&git_repo)?;
                 p.send_line("list")?;
                 p.expect(
-                    format!(
-                        "fetching ref list over filesystem from {}...\r\n",
-                        source_path
-                    )
-                    .as_str(),
+                    format!("fetching {} ref list over filesystem...\r\n", source_path).as_str(),
                 )?;
                 p.expect(
                     format!(
@@ -295,11 +281,7 @@ mod with_state_announcement {
                 let mut p = cli_tester_after_fetch(&git_repo)?;
                 p.send_line("list")?;
                 p.expect(
-                    format!(
-                        "fetching ref list over filesystem from {}...\r\n",
-                        source_path
-                    )
-                    .as_str(),
+                    format!("fetching {} ref list over filesystem...\r\n", source_path).as_str(),
                 )?;
                 // println!("{}", p.expect_eventually("\r\n\r\n")?);
                 let res = p.expect_eventually("\r\n\r\n")?;
diff --git a/tests/git_remote_nostr/push.rs b/tests/git_remote_nostr/push.rs
index f0d519e..5066d33 100644
--- a/tests/git_remote_nostr/push.rs
+++ b/tests/git_remote_nostr/push.rs
@@ -930,13 +930,7 @@ async fn proposal_merge_commit_pushed_to_main_leads_to_status_event_issued() ->
 
         let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push"]);
         cli_expect_nostr_fetch(&mut p)?;
-        p.expect(
-            format!(
-                "fetching ref list over filesystem from {}...\r\n",
-                source_path
-            )
-            .as_str(),
-        )?;
+        p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?;
 
         p.expect("merge commit ")?;
         // shorthand merge commit id appears in this gap
@@ -1080,13 +1074,7 @@ async fn push_2_commits_to_existing_proposal() -> Result<()> {
 
         let mut p = CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push"]);
         cli_expect_nostr_fetch(&mut p)?;
-        p.expect(
-            format!(
-                "fetching ref list over filesystem from {}...\r\n",
-                source_path
-            )
-            .as_str(),
-        )?;
+        p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?;
         p.expect(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?;
         let output = p.expect_end_eventually()?;
 
@@ -1240,13 +1228,7 @@ async fn force_push_creates_proposal_revision() -> Result<()> {
         let mut p =
             CliTester::new_git_with_remote_helper_from_dir(&git_repo.dir, ["push", "--force"]);
         cli_expect_nostr_fetch(&mut p)?;
-        p.expect(
-            format!(
-                "fetching ref list over filesystem from {}...\r\n",
-                source_path
-            )
-            .as_str(),
-        )?;
+        p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?;
         p.expect(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?;
         let output = p.expect_end_eventually()?;
 
@@ -1395,13 +1377,7 @@ async fn push_new_pr_branch_creates_proposal() -> Result<()> {
             ["push", "-u", "origin", branch_name],
         );
         cli_expect_nostr_fetch(&mut p)?;
-        p.expect(
-            format!(
-                "fetching ref list over filesystem from {}...\r\n",
-                source_path
-            )
-            .as_str(),
-        )?;
+        p.expect(format!("fetching {} ref list over filesystem...\r\n", source_path).as_str())?;
         p.expect(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?;
         let output = p.expect_end_eventually()?;