NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-15 15:35:46 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[FIX] runbot_merge: handle PRs with no body (not just empty)

Browse Source
This commit is contained in:
Xavier Morel 2018-09-19 14:40:36 +02:00
parent 7310cd1f1d
commit c2db5659d8
2 changed files with 34 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
runbot_merge/controllers/__init__.py
View File

@ -123,8 +123,10 @@ def handle_pr(env, event):
_logger.info("%s: %s:%s (%s) (%s)", event['action'], repo.name, pr['number'], pr['title'].strip(), author.github_login)
if event['action'] == 'opened':
# some PRs have leading/trailing newlines in body/title (resp)
title = pr['title'].strip()
body = pr['body'].strip()
message = pr['title'].strip()
body = pr['body'] and pr['body'].strip()
if body:
message += '\n\n' + body
pr_obj = env['runbot_merge.pull_requests'].create({
'number': pr['number'],
'label': pr['head']['label'],
@ -133,7 +135,7 @@ def handle_pr(env, event):
'repository': repo.id,
'head': pr['head']['sha'],
'squash': pr['commits'] == 1,
'message': '{}\n\n{}'.format(title, body),
'message': message,
})
return "Tracking PR as {}".format(pr_obj.id)

29
runbot_merge/tests/test_basic.py
View File

@ -804,6 +804,35 @@ class TestMergeMethod:
expected = node('gibberish\n\nblahblah\n\ncloses {}#{}'.format(repo.name, prx.number), m, c0)
assert log_to_node(repo.log('heads/master')), expected
def test_unrebase_emptymessage(self, repo, env):
""" When merging between master branches (e.g. forward port), the PR
may have only a title
"""
m = repo.make_commit(None, "M", None, tree={'a': 'a'})
repo.make_ref('heads/master', m)
c0 = repo.make_commit(m, 'C0', None, tree={'a': 'b'})
prx = repo.make_pr("gibberish", None, target='master', ctid=c0, user='user')
env['runbot_merge.project']._check_progress()
repo.post_status(prx.head, 'success', 'legal/cla')
repo.post_status(prx.head, 'success', 'ci/runbot')
prx.post_comment('hansen r+ rebase-', 'reviewer')
env['runbot_merge.project']._check_progress()
repo.post_status('heads/staging.master', 'success', 'ci/runbot')
repo.post_status('heads/staging.master', 'success', 'legal/cla')
env['runbot_merge.project']._check_progress()
master = repo.commit('heads/master')
assert master.parents == [m, prx.head], \
"master's parents should be the old master & the PR head"
m = node('M')
c0 = node('C0', m)
expected = node('gibberish\n\ncloses {}#{}'.format(repo.name, prx.number), m, c0)
assert log_to_node(repo.log('heads/master')), expected
def test_pr_mergehead(self, repo, env):
""" if the head of the PR is a merge commit and one of the parents is
in the target, replicate the merge commit instead of merging