On merge-and-push add list of commits to issue
This commit is contained in:
parent
74a2342278
commit
4479ddcb12
|
@ -358,9 +358,12 @@ def merge_and_push(issue, target_branch):
|
|||
except IndexError:
|
||||
raise click.UsageError('%r is not a local branch.' % target_branch)
|
||||
|
||||
notes = '<pre>%s</pre>' % repo.git.log('%s..' % target_branch)
|
||||
click.echo(notes)
|
||||
for commit in get_commits(repo, target_branch):
|
||||
if 'rebase' in commit.message:
|
||||
click.echo('Commit %s contains the word rebase :' % commit.hexsha[:8])
|
||||
click.echo()
|
||||
click.echo('Commit %s contains the word "rebase" :' % commit.hexsha[:8])
|
||||
click.echo()
|
||||
click.echo(''.join([' ' + line for line in commit.message.splitlines()]))
|
||||
click.echo()
|
||||
|
@ -449,7 +452,7 @@ def merge_and_push(issue, target_branch):
|
|||
issue.assigned_to_id = current_user.id
|
||||
issue.save()
|
||||
kwargs['status_id'] = api.resolu_a_deployer.id
|
||||
api.issue.update(issue.id, **kwargs)
|
||||
api.issue.update(issue.id, notes=notes, **kwargs)
|
||||
|
||||
|
||||
@redmine.command(name='rebase')
|
||||
|
|
Loading…
Reference in New Issue