Skip to content

Print out commit message after continuing #109

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Mariatta merged 1 commit into from
Jun 7, 2017
Merged

Print out commit message after continuing #109

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions cherry_picker/cherry_picker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,9 @@ def continue_cherry_pick(self):

self.cleanup_branch(cherry_pick_branch)

click.echo("\nBackport PR:\n")
click.echo(updated_commit_message)

@brettcannon brettcannon Jun 5, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So is this printing out the title, message body, or both? The previous line is ambiguous without context so I don't know what to expect to see in the eventual output.

@Mariatta Mariatta Jun 6, 2017

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This prints out the title, prefixed with [X.Y], message body, and cherry picked from .. message

Example output when backporting PR python/cpython#879:

[3.6] bpo-29931 fix __lt__ check in ipaddress.ip_interface for both v4 and v6. (GH-879)                     
                                                                                                            
the original logic was just comparing the network address                                                   
but this is wrong because if the network address is equal then                                              
we need to compare the ip address for breaking the tie                                                      
                                                                                                            
add more ip_interface comparison tests.                                                                     
(cherry picked from commit 7bd8d3e794782582a4ad1c9749424fff86802c3e)

I recorded an asciicast: https://asciinema.org/a/123496

@brettcannon brettcannon Jun 7, 2017

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!


else:
click.echo(u"Currently in `master` branch. Will not continue. \U0001F61B")

Expand Down