STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #8381 from ffalor/prmerge

Browse source 
print info about merge when interactive
This commit is contained in:
Andy Feller 2023-12-01 08:43:37 -05:00 • committed by GitHub
commit a6196994b5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/cmd/pr/merge/merge.go
View file

@ -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 {

11
pkg/cmd/pr/merge/merge_test.go
View file

@ -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) {