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

[FIX] forwardport: PR message

Browse Source 
* avoid losing original PR message
* add PR source to description
This commit is contained in:
Xavier Morel 2019-09-10 09:54:25 +02:00
parent 79777662df
commit 4fcebed563
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
forwardport/models/project.py
View File

@ -380,6 +380,12 @@ class PullRequests(models.Model):
owner, _ = pr.repository.fp_remote_target.split('/', 1) owner, _ = pr.repository.fp_remote_target.split('/', 1)
source = pr.source_id or pr source = pr.source_id or pr
message = source.message message = source.message
if message:
message += '\n\n'
else:
message = ''
message += "Forward-Port-Of: %s#%s" % (source.repository.name, source.number)
(h, out, err) = conflicts.get(pr) or (None, None, None) (h, out, err) = conflicts.get(pr) or (None, None, None)
if h: if h:
message = """Cherrypicking %s of source #%d failed with the following message = """Cherrypicking %s of source #%d failed with the following
@ -407,7 +413,7 @@ In the former case, you may want to edit this PR message as well.
target.name, target.name,
' (failed)' if has_conflicts else '' ' (failed)' if has_conflicts else ''
), ),
'message': message, 'body': message,
'head': '%s:%s' % (owner, new_branch), 'head': '%s:%s' % (owner, new_branch),
'base': target.name, 'base': target.name,
'draft': has_conflicts, 'draft': has_conflicts,