From de89a7ec528fa57702199f94e63b42f827bd2fdf Mon Sep 17 00:00:00 2001 From: DanConwayDev Date: Sun, 18 Aug 2024 08:14:29 +0100 Subject: feat(remote): `push` log merge event creation so the user knows that a merge commit event will be issued --- src/git_remote_helper.rs | 11 ++++++++++- tests/git_remote_helper.rs | 4 ++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/git_remote_helper.rs b/src/git_remote_helper.rs index a03c6cf..cb13e8c 100644 --- a/src/git_remote_helper.rs +++ b/src/git_remote_helper.rs @@ -715,6 +715,7 @@ async fn push( events.push(new_repo_state.event); for event in get_merged_status_events( + &term, repo_ref, git_repo, nostr_remote_url, @@ -1128,6 +1129,7 @@ fn generate_updated_state( } async fn get_merged_status_events( + term: &console::Term, repo_ref: &RepoRef, git_repo: &Repo, remote_nostr_url: &str, @@ -1171,7 +1173,14 @@ async fn get_merged_status_events( let (proposal_id, revision_id) = get_proposal_and_revision_root_from_patch(git_repo, commit_event) .await?; - // TODO: write to terminal to tell user + term.write_line( + format!( + "merge commit {}: create nostr proposal status event", + &commit.id().to_string()[..7], + ) + .as_str(), + )?; + events.push( create_merge_status( signer, diff --git a/tests/git_remote_helper.rs b/tests/git_remote_helper.rs index 98637e8..cce8e42 100644 --- a/tests/git_remote_helper.rs +++ b/tests/git_remote_helper.rs @@ -1753,6 +1753,10 @@ mod push { 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 refs list: {}...\r\n\r", source_path).as_str())?; + + p.expect("merge commit ")?; + // shorthand merge commit id appears in this gap + p.expect_eventually(": create nostr proposal status event\r\n")?; p.expect(format!("To {}\r\n", get_nostr_remote_url()?).as_str())?; let output = p.expect_end_eventually()?; -- cgit v1.2.3