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

[FIX] forwardport: incorrect / misleading conflict message

Browse Source 
Given a PR batch getting forward-ported together, if one of the PRs
has a conflict the others should be considered "in conflict" as well,
and should have a note pointing in that direction and indicating that
the PR should be approved the normal way eventually. Which they do.

However, the message is confusing as it gets bolted on the normal
non-conflicting message, either noting that it's part of a chain
or (worse because it gives conflicting indication) the "terminal"
message recommending using the forwardbot to approve of the entire
chain.

I've no idea why I did it that way instead of just adding a case to
the conditional, and the commit message provides no indication. But
perform that change, it seems innocuous, hopefully there weren't good
reasons I forgot about for doing it the other way around.

Fixes #367
This commit is contained in:
Xavier Morel 2020-05-19 14:13:21 +02:00 committed by xmo-odoo
parent 3bf9b263f0
commit 4d528465d9
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
forwardport/models/project.py
View File

@ -36,7 +36,7 @@ from odoo.tools.appdirs import user_cache_dir
from odoo.addons.runbot_merge import utils
from odoo.addons.runbot_merge.models.pull_requests import RPLUS
FOOTER = '\nMore info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port\n'
footer = '\nMore info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port\n'
DEFAULT_DELTA = dateutil.relativedelta.relativedelta(days=3)
@ -656,7 +656,7 @@ class PullRequests(models.Model):
message = source._pingline() + """
The next pull request (%s) is in conflict. You can merge the chain up to here by saying
> @%s r+
%s""" % (new_pr.display_name, pr.repository.project_id.fp_github_name, FOOTER)
%s""" % (new_pr.display_name, pr.repository.project_id.fp_github_name, footer)
self.env['runbot_merge.pull_requests.feedback'].create({
'repository': pr.repository.id,
'pull_request': pr.number,
@ -672,18 +672,6 @@ The next pull request (%s) is in conflict. You can merge the chain up to here by
source = pr.source_id or pr
(h, out, err) = conflicts.get(pr) or (None, None, None)
footer = FOOTER
if has_conflicts and not h:
footer = '\n**WARNING** at least one co-dependent PR (%s) ' \
'did not properly forward-port, you will need to ' \
'fix it before this can be merged. Both this PR and ' \
'the others will need to be approved via `@%s r+` ' \
'as they are all considered "in conflict".\n%s' % (
', '.join(p.display_name for p in (new_batch - new_pr)),
proj.github_prefix,
footer
)
if h:
sout = serr = ''
if out.strip():
@ -698,6 +686,17 @@ Either perform the forward-port manually (and push to this branch, proceeding as
In the former case, you may want to edit this PR message as well.
""" % (h, source.display_name, sout, serr)
elif has_conflicts:
message = """%s
While this was properly forward-ported, at least one co-dependent PR (%s) did not succeed. You will need to fix it before this can be merged.
Both this PR and the others will need to be approved via `@%s r+` as they are all considered "in conflict".
%s""" % (
source._pingline(),
', '.join(p.display_name for p in (new_batch - new_pr)),
proj.github_prefix,
footer
)
elif base._find_next_target(new_pr) is None:
ancestors = "".join(
"* %s\n" % p.display_name