Skip to content
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

Jump to bottom

cherry_picker: add a flag if backport commit msg should be prefixed #193

Merged
merged 1 commit into from
Oct 19, 2017
Merged

cherry_picker: add a flag if backport commit msg should be prefixed #193

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
11 changes: 8 additions & 3 deletions cherry_picker/cherry_picker/cherry_picker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,15 @@ class CherryPickException(Exception):
class CherryPicker:

def __init__(self, pr_remote, commit_sha1, branches,
*, dry_run=False, push=True):
*, dry_run=False, push=True,
prefix_commit=True
):
self.pr_remote = pr_remote
self.commit_sha1 = commit_sha1
self.branches = branches
self.dry_run = dry_run
self.push = push
self.prefix_commit = prefix_commit

@property
def upstream(self):
Expand Down Expand Up @@ -142,9 +145,11 @@ def get_exit_message(self, branch):

def amend_commit_message(self, cherry_pick_branch):
""" prefix the commit message with (X.Y) """
base_branch = get_base_branch(cherry_pick_branch)

updated_commit_message = f"[{base_branch}] {self.get_commit_message(self.commit_sha1)}{os.linesep}(cherry picked from commit {self.commit_sha1})"
commit_prefix = ""
if self.prefix_commit:
commit_prefix = f"[{get_base_branch(cherry_pick_branch)}] "
updated_commit_message = f"{commit_prefix}{self.get_commit_message(self.commit_sha1)}{os.linesep}(cherry picked from commit {self.commit_sha1})"
updated_commit_message = updated_commit_message.replace('#', 'GH-')
if self.dry_run:
click.echo(f" dry-run: git commit --amend -m '{updated_commit_message}'")
Expand Down