From ed68930c64ba212e4c7bff07d929af6f1f3bb8b3 Mon Sep 17 00:00:00 2001 From: ffalor <35144141+ffalor@users.noreply.github.com> Date: Sun, 26 Nov 2023 18:44:52 -0600 Subject: [PATCH 1/2] print info about merge when interactive --- pkg/cmd/pr/merge/merge.go | 2 ++ pkg/cmd/pr/merge/merge_test.go | 11 ++++++----- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkg/cmd/pr/merge/merge.go b/pkg/cmd/pr/merge/merge.go index a23dc7390..60245070c 100644 --- a/pkg/cmd/pr/merge/merge.go +++ b/pkg/cmd/pr/merge/merge.go @@ -302,6 +302,8 @@ func (m *mergeContext) merge() error { return cmdutil.FlagErrorf("--merge, --rebase, or --squash required when not running interactively") } + m.infof("Merging pull request #%d (%s)\n", m.pr.Number, m.pr.Title) + apiClient := api.NewClientFromHTTP(m.httpClient) r, err := api.GitHubRepo(apiClient, m.baseRepo) if err != nil { diff --git a/pkg/cmd/pr/merge/merge_test.go b/pkg/cmd/pr/merge/merge_test.go index 5055bf8f4..0eb6a81fb 100644 --- a/pkg/cmd/pr/merge/merge_test.go +++ b/pkg/cmd/pr/merge/merge_test.go @@ -1275,7 +1275,7 @@ func TestPRMergeTTY(t *testing.T) { t.Fatalf("Got unexpected error running `pr merge` %s", err) } - assert.Equal(t, "✓ Merged pull request #3 (It was the best of times)\n", output.Stderr()) + assert.Equal(t, "Merging pull request #3 (It was the best of times)\n✓ Merged pull request #3 (It was the best of times)\n", output.Stderr()) } func TestPRMergeTTY_withDeleteBranch(t *testing.T) { @@ -1346,6 +1346,7 @@ func TestPRMergeTTY_withDeleteBranch(t *testing.T) { assert.Equal(t, "", output.String()) assert.Equal(t, heredoc.Doc(` + Merging pull request #3 (It was the best of times) ✓ Merged pull request #3 (It was the best of times) ✓ Deleted local branch blueberries and switched to branch main ✓ Deleted remote branch blueberries @@ -1437,7 +1438,7 @@ func TestPRMergeTTY_squashEditCommitMsgAndSubject(t *testing.T) { assert.NoError(t, err) assert.Equal(t, "", stdout.String()) - assert.Equal(t, "✓ Squashed and merged pull request #123 (title)\n", stderr.String()) + assert.Equal(t, "Merging pull request #123 (title)\n✓ Squashed and merged pull request #123 (title)\n", stderr.String()) } func TestPRMergeEmptyStrategyNonTTY(t *testing.T) { @@ -1473,7 +1474,7 @@ func TestPRTTY_cancelled(t *testing.T) { shared.RunCommandFinder( "", - &api.PullRequest{ID: "THE-ID", Number: 123, MergeStateStatus: "CLEAN"}, + &api.PullRequest{ID: "THE-ID", Number: 123, Title: "title", MergeStateStatus: "CLEAN"}, ghrepo.New("OWNER", "REPO"), ) @@ -1516,7 +1517,7 @@ func TestPRTTY_cancelled(t *testing.T) { t.Fatalf("got error %v", err) } - assert.Equal(t, "Cancelled.\n", output.Stderr()) + assert.Equal(t, "Merging pull request #123 (title)\nCancelled.\n", output.Stderr()) } func Test_mergeMethodSurvey(t *testing.T) { @@ -1866,7 +1867,7 @@ func TestPrAddToMergeQueueAdmin(t *testing.T) { } assert.Equal(t, "", output.String()) - assert.Equal(t, "✓ Merged pull request #1 (The title of the PR)\n", output.Stderr()) + assert.Equal(t, "Merging pull request #1 (The title of the PR)\n✓ Merged pull request #1 (The title of the PR)\n", output.Stderr()) } func TestPrAddToMergeQueueAdminWithMergeStrategy(t *testing.T) { From 74e5e84d712158dcea5cca090854b3455b6ff0e5 Mon Sep 17 00:00:00 2001 From: ffalor <35144141+ffalor@users.noreply.github.com> Date: Thu, 30 Nov 2023 18:51:09 -0600 Subject: [PATCH 2/2] Update pkg/cmd/pr/merge/merge.go Co-authored-by: Andy Feller --- pkg/cmd/pr/merge/merge.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cmd/pr/merge/merge.go b/pkg/cmd/pr/merge/merge.go index 60245070c..e917b16f2 100644 --- a/pkg/cmd/pr/merge/merge.go +++ b/pkg/cmd/pr/merge/merge.go @@ -302,7 +302,7 @@ func (m *mergeContext) merge() error { return cmdutil.FlagErrorf("--merge, --rebase, or --squash required when not running interactively") } - m.infof("Merging pull request #%d (%s)\n", m.pr.Number, m.pr.Title) + _ = m.infof("Merging pull request #%d (%s)\n", m.pr.Number, m.pr.Title) apiClient := api.NewClientFromHTTP(m.httpClient) r, err := api.GitHubRepo(apiClient, m.baseRepo)