2022-07-11 13:17:04 +07:00
|
|
|
import contextlib
|
2021-11-12 22:04:34 +07:00
|
|
|
import enum
|
|
|
|
import itertools
|
2022-07-11 13:17:04 +07:00
|
|
|
import json
|
2021-11-12 22:04:34 +07:00
|
|
|
import logging
|
|
|
|
import time
|
2022-12-07 15:25:55 +07:00
|
|
|
from collections import Counter
|
2021-11-12 22:04:34 +07:00
|
|
|
|
2023-01-24 13:41:14 +07:00
|
|
|
from markupsafe import Markup
|
|
|
|
|
2022-12-07 15:25:55 +07:00
|
|
|
from odoo import models, fields, api, Command
|
2022-07-11 13:17:04 +07:00
|
|
|
from odoo.addons.runbot_merge.exceptions import FastForwardError
|
[FIX] runbot_merge: make freeze wizard labels lookup not shit
I DECLARE BANKRUPTCY!!!
The previous implementation of labels lookup was really not
intuitive (it was just a char field, and matched labels by equality
including the owner tag), and was also full of broken edge
cases (e.g. traceback if a label matched multiple PRs in the same repo
because people reuse branch names).
Tried messing about with contextual `display_name` and `name_search`
on PRs but the client goes wonky in that case, and there is no clean
autocomplete for non-relational fields.
So created a view which reifies labels, and that can be used as the
basis for our search. It doesn't have to be maintained by hand, can be
searched somewhat flexibly, we can add new view fields in the future
if desirable, and it seems to work fine providing a nice
understandable UX, with the reliability of using a normal Odoo model
the normal way.
Also fixed the handling of bump PRs, clearly clearing the entire field
before trying to update existing records (even with a link_to
inbetween) is not the web client's fancy, re-selecting the current
label would just empty the thing entirely.
So use a two-step process slightly closer to the release PRs instead:
- first update or delete the existing bump PRs
- then add the new ones
The second part is because bump PRs are somewhat less critical than
release, so it can be a bit more DWIM compared to the more deliberate
process of release PRs where first the list of repositories involved
has to be set up just so, then the PRs can be filled in each of them.
Fixes #697
2023-01-24 17:19:18 +07:00
|
|
|
from odoo.exceptions import UserError
|
|
|
|
from odoo.tools import drop_view_if_exists
|
2021-11-12 22:04:34 +07:00
|
|
|
|
|
|
|
_logger = logging.getLogger(__name__)
|
|
|
|
class FreezeWizard(models.Model):
|
|
|
|
_name = 'runbot_merge.project.freeze'
|
|
|
|
_description = "Wizard for freezing a project('s master)"
|
|
|
|
|
|
|
|
project_id = fields.Many2one('runbot_merge.project', required=True)
|
2022-07-11 13:17:04 +07:00
|
|
|
errors = fields.Text(compute='_compute_errors')
|
2021-11-12 22:04:34 +07:00
|
|
|
branch_name = fields.Char(required=True, help="Name of the new branches to create")
|
2022-07-11 13:17:04 +07:00
|
|
|
|
2021-11-12 22:04:34 +07:00
|
|
|
required_pr_ids = fields.Many2many(
|
|
|
|
'runbot_merge.pull_requests', string="Required Pull Requests",
|
|
|
|
domain="[('state', 'not in', ('closed', 'merged'))]",
|
|
|
|
help="Pull requests which must have been merged before the freeze is allowed",
|
|
|
|
)
|
2022-07-11 13:17:04 +07:00
|
|
|
|
2023-01-24 13:41:14 +07:00
|
|
|
pr_state_key = fields.Html(string="Color Key", compute='_compute_state_key', readonly=True)
|
|
|
|
def _compute_state_key(self):
|
|
|
|
s = dict(self.env['runbot_merge.pull_requests']._fields['state'].selection)
|
|
|
|
self.pr_state_key = Markup("""
|
|
|
|
<p>%s</p>
|
|
|
|
""") % Markup(" ").join(
|
|
|
|
Markup('<span class="badge border-0 fucking_color_key_{}">{}</span>').format(v, s[k])
|
|
|
|
for k, v in STATE_COLORMAP.items()
|
|
|
|
if v
|
|
|
|
)
|
|
|
|
|
[FIX] runbot_merge: make freeze wizard labels lookup not shit
I DECLARE BANKRUPTCY!!!
The previous implementation of labels lookup was really not
intuitive (it was just a char field, and matched labels by equality
including the owner tag), and was also full of broken edge
cases (e.g. traceback if a label matched multiple PRs in the same repo
because people reuse branch names).
Tried messing about with contextual `display_name` and `name_search`
on PRs but the client goes wonky in that case, and there is no clean
autocomplete for non-relational fields.
So created a view which reifies labels, and that can be used as the
basis for our search. It doesn't have to be maintained by hand, can be
searched somewhat flexibly, we can add new view fields in the future
if desirable, and it seems to work fine providing a nice
understandable UX, with the reliability of using a normal Odoo model
the normal way.
Also fixed the handling of bump PRs, clearly clearing the entire field
before trying to update existing records (even with a link_to
inbetween) is not the web client's fancy, re-selecting the current
label would just empty the thing entirely.
So use a two-step process slightly closer to the release PRs instead:
- first update or delete the existing bump PRs
- then add the new ones
The second part is because bump PRs are somewhat less critical than
release, so it can be a bit more DWIM compared to the more deliberate
process of release PRs where first the list of repositories involved
has to be set up just so, then the PRs can be filled in each of them.
Fixes #697
2023-01-24 17:19:18 +07:00
|
|
|
release_label = fields.Many2one('runbot_merge.freeze.labels', store=False, string="Release label", help="Find release PRs by label")
|
2022-07-11 13:17:04 +07:00
|
|
|
release_pr_ids = fields.One2many(
|
|
|
|
'runbot_merge.project.freeze.prs', 'wizard_id',
|
|
|
|
string="Release pull requests",
|
|
|
|
help="Pull requests used as tips for the freeze branches, "
|
2022-12-07 15:25:55 +07:00
|
|
|
"one per repository",
|
2022-07-11 13:17:04 +07:00
|
|
|
)
|
|
|
|
|
[FIX] runbot_merge: make freeze wizard labels lookup not shit
I DECLARE BANKRUPTCY!!!
The previous implementation of labels lookup was really not
intuitive (it was just a char field, and matched labels by equality
including the owner tag), and was also full of broken edge
cases (e.g. traceback if a label matched multiple PRs in the same repo
because people reuse branch names).
Tried messing about with contextual `display_name` and `name_search`
on PRs but the client goes wonky in that case, and there is no clean
autocomplete for non-relational fields.
So created a view which reifies labels, and that can be used as the
basis for our search. It doesn't have to be maintained by hand, can be
searched somewhat flexibly, we can add new view fields in the future
if desirable, and it seems to work fine providing a nice
understandable UX, with the reliability of using a normal Odoo model
the normal way.
Also fixed the handling of bump PRs, clearly clearing the entire field
before trying to update existing records (even with a link_to
inbetween) is not the web client's fancy, re-selecting the current
label would just empty the thing entirely.
So use a two-step process slightly closer to the release PRs instead:
- first update or delete the existing bump PRs
- then add the new ones
The second part is because bump PRs are somewhat less critical than
release, so it can be a bit more DWIM compared to the more deliberate
process of release PRs where first the list of repositories involved
has to be set up just so, then the PRs can be filled in each of them.
Fixes #697
2023-01-24 17:19:18 +07:00
|
|
|
bump_label = fields.Many2one('runbot_merge.freeze.labels', store=False, string="Bump label", help="Find bump PRs by label")
|
2022-07-11 13:17:04 +07:00
|
|
|
bump_pr_ids = fields.One2many(
|
|
|
|
'runbot_merge.project.freeze.bumps', 'wizard_id',
|
|
|
|
string="Bump pull requests",
|
|
|
|
help="Pull requests used as tips of the frozen-off branches, "
|
2022-12-07 15:25:55 +07:00
|
|
|
"one per repository",
|
2022-07-11 13:17:04 +07:00
|
|
|
)
|
2021-11-12 22:04:34 +07:00
|
|
|
|
|
|
|
_sql_constraints = [
|
|
|
|
('unique_per_project', 'unique (project_id)',
|
|
|
|
"There should be only one ongoing freeze per project"),
|
|
|
|
]
|
|
|
|
|
2022-07-11 13:17:04 +07:00
|
|
|
@api.onchange('release_label')
|
|
|
|
def _onchange_release_label(self):
|
2022-12-07 15:25:55 +07:00
|
|
|
if not self.release_label:
|
|
|
|
return
|
|
|
|
|
2022-07-11 13:17:04 +07:00
|
|
|
prs = self.env['runbot_merge.pull_requests'].search([
|
[FIX] runbot_merge: make freeze wizard labels lookup not shit
I DECLARE BANKRUPTCY!!!
The previous implementation of labels lookup was really not
intuitive (it was just a char field, and matched labels by equality
including the owner tag), and was also full of broken edge
cases (e.g. traceback if a label matched multiple PRs in the same repo
because people reuse branch names).
Tried messing about with contextual `display_name` and `name_search`
on PRs but the client goes wonky in that case, and there is no clean
autocomplete for non-relational fields.
So created a view which reifies labels, and that can be used as the
basis for our search. It doesn't have to be maintained by hand, can be
searched somewhat flexibly, we can add new view fields in the future
if desirable, and it seems to work fine providing a nice
understandable UX, with the reliability of using a normal Odoo model
the normal way.
Also fixed the handling of bump PRs, clearly clearing the entire field
before trying to update existing records (even with a link_to
inbetween) is not the web client's fancy, re-selecting the current
label would just empty the thing entirely.
So use a two-step process slightly closer to the release PRs instead:
- first update or delete the existing bump PRs
- then add the new ones
The second part is because bump PRs are somewhat less critical than
release, so it can be a bit more DWIM compared to the more deliberate
process of release PRs where first the list of repositories involved
has to be set up just so, then the PRs can be filled in each of them.
Fixes #697
2023-01-24 17:19:18 +07:00
|
|
|
('label', '=', self.release_label.label),
|
|
|
|
('state', 'not in', ('merged', 'closed')),
|
2022-07-11 13:17:04 +07:00
|
|
|
])
|
|
|
|
for release_pr in self.release_pr_ids:
|
[FIX] runbot_merge: make freeze wizard labels lookup not shit
I DECLARE BANKRUPTCY!!!
The previous implementation of labels lookup was really not
intuitive (it was just a char field, and matched labels by equality
including the owner tag), and was also full of broken edge
cases (e.g. traceback if a label matched multiple PRs in the same repo
because people reuse branch names).
Tried messing about with contextual `display_name` and `name_search`
on PRs but the client goes wonky in that case, and there is no clean
autocomplete for non-relational fields.
So created a view which reifies labels, and that can be used as the
basis for our search. It doesn't have to be maintained by hand, can be
searched somewhat flexibly, we can add new view fields in the future
if desirable, and it seems to work fine providing a nice
understandable UX, with the reliability of using a normal Odoo model
the normal way.
Also fixed the handling of bump PRs, clearly clearing the entire field
before trying to update existing records (even with a link_to
inbetween) is not the web client's fancy, re-selecting the current
label would just empty the thing entirely.
So use a two-step process slightly closer to the release PRs instead:
- first update or delete the existing bump PRs
- then add the new ones
The second part is because bump PRs are somewhat less critical than
release, so it can be a bit more DWIM compared to the more deliberate
process of release PRs where first the list of repositories involved
has to be set up just so, then the PRs can be filled in each of them.
Fixes #697
2023-01-24 17:19:18 +07:00
|
|
|
p = prs.filtered(lambda p: p.repository == release_pr.repository_id)
|
|
|
|
if len(p) < 2:
|
|
|
|
release_pr.pr_id = p
|
2022-07-11 13:17:04 +07:00
|
|
|
|
|
|
|
@api.onchange('release_pr_ids')
|
|
|
|
def _onchange_release_prs(self):
|
2022-12-07 15:25:55 +07:00
|
|
|
labels = {p.pr_id.label for p in self.release_pr_ids if p.pr_id}
|
[FIX] runbot_merge: make freeze wizard labels lookup not shit
I DECLARE BANKRUPTCY!!!
The previous implementation of labels lookup was really not
intuitive (it was just a char field, and matched labels by equality
including the owner tag), and was also full of broken edge
cases (e.g. traceback if a label matched multiple PRs in the same repo
because people reuse branch names).
Tried messing about with contextual `display_name` and `name_search`
on PRs but the client goes wonky in that case, and there is no clean
autocomplete for non-relational fields.
So created a view which reifies labels, and that can be used as the
basis for our search. It doesn't have to be maintained by hand, can be
searched somewhat flexibly, we can add new view fields in the future
if desirable, and it seems to work fine providing a nice
understandable UX, with the reliability of using a normal Odoo model
the normal way.
Also fixed the handling of bump PRs, clearly clearing the entire field
before trying to update existing records (even with a link_to
inbetween) is not the web client's fancy, re-selecting the current
label would just empty the thing entirely.
So use a two-step process slightly closer to the release PRs instead:
- first update or delete the existing bump PRs
- then add the new ones
The second part is because bump PRs are somewhat less critical than
release, so it can be a bit more DWIM compared to the more deliberate
process of release PRs where first the list of repositories involved
has to be set up just so, then the PRs can be filled in each of them.
Fixes #697
2023-01-24 17:19:18 +07:00
|
|
|
self.release_label = len(labels) == 1 and self.env['runbot_merge.freeze.labels'].search([
|
|
|
|
('label', '=', labels.pop()),
|
|
|
|
])
|
2022-07-11 13:17:04 +07:00
|
|
|
|
|
|
|
@api.onchange('bump_label')
|
|
|
|
def _onchange_bump_label(self):
|
[FIX] runbot_merge: make freeze wizard labels lookup not shit
I DECLARE BANKRUPTCY!!!
The previous implementation of labels lookup was really not
intuitive (it was just a char field, and matched labels by equality
including the owner tag), and was also full of broken edge
cases (e.g. traceback if a label matched multiple PRs in the same repo
because people reuse branch names).
Tried messing about with contextual `display_name` and `name_search`
on PRs but the client goes wonky in that case, and there is no clean
autocomplete for non-relational fields.
So created a view which reifies labels, and that can be used as the
basis for our search. It doesn't have to be maintained by hand, can be
searched somewhat flexibly, we can add new view fields in the future
if desirable, and it seems to work fine providing a nice
understandable UX, with the reliability of using a normal Odoo model
the normal way.
Also fixed the handling of bump PRs, clearly clearing the entire field
before trying to update existing records (even with a link_to
inbetween) is not the web client's fancy, re-selecting the current
label would just empty the thing entirely.
So use a two-step process slightly closer to the release PRs instead:
- first update or delete the existing bump PRs
- then add the new ones
The second part is because bump PRs are somewhat less critical than
release, so it can be a bit more DWIM compared to the more deliberate
process of release PRs where first the list of repositories involved
has to be set up just so, then the PRs can be filled in each of them.
Fixes #697
2023-01-24 17:19:18 +07:00
|
|
|
if not self.bump_label:
|
2022-12-07 15:25:55 +07:00
|
|
|
return
|
2022-07-11 13:17:04 +07:00
|
|
|
prs = self.env['runbot_merge.pull_requests'].search([
|
[FIX] runbot_merge: make freeze wizard labels lookup not shit
I DECLARE BANKRUPTCY!!!
The previous implementation of labels lookup was really not
intuitive (it was just a char field, and matched labels by equality
including the owner tag), and was also full of broken edge
cases (e.g. traceback if a label matched multiple PRs in the same repo
because people reuse branch names).
Tried messing about with contextual `display_name` and `name_search`
on PRs but the client goes wonky in that case, and there is no clean
autocomplete for non-relational fields.
So created a view which reifies labels, and that can be used as the
basis for our search. It doesn't have to be maintained by hand, can be
searched somewhat flexibly, we can add new view fields in the future
if desirable, and it seems to work fine providing a nice
understandable UX, with the reliability of using a normal Odoo model
the normal way.
Also fixed the handling of bump PRs, clearly clearing the entire field
before trying to update existing records (even with a link_to
inbetween) is not the web client's fancy, re-selecting the current
label would just empty the thing entirely.
So use a two-step process slightly closer to the release PRs instead:
- first update or delete the existing bump PRs
- then add the new ones
The second part is because bump PRs are somewhat less critical than
release, so it can be a bit more DWIM compared to the more deliberate
process of release PRs where first the list of repositories involved
has to be set up just so, then the PRs can be filled in each of them.
Fixes #697
2023-01-24 17:19:18 +07:00
|
|
|
('label', '=', self.bump_label.label),
|
|
|
|
('state', 'not in', ('merged', 'closed')),
|
2022-07-11 13:17:04 +07:00
|
|
|
])
|
[FIX] runbot_merge: make freeze wizard labels lookup not shit
I DECLARE BANKRUPTCY!!!
The previous implementation of labels lookup was really not
intuitive (it was just a char field, and matched labels by equality
including the owner tag), and was also full of broken edge
cases (e.g. traceback if a label matched multiple PRs in the same repo
because people reuse branch names).
Tried messing about with contextual `display_name` and `name_search`
on PRs but the client goes wonky in that case, and there is no clean
autocomplete for non-relational fields.
So created a view which reifies labels, and that can be used as the
basis for our search. It doesn't have to be maintained by hand, can be
searched somewhat flexibly, we can add new view fields in the future
if desirable, and it seems to work fine providing a nice
understandable UX, with the reliability of using a normal Odoo model
the normal way.
Also fixed the handling of bump PRs, clearly clearing the entire field
before trying to update existing records (even with a link_to
inbetween) is not the web client's fancy, re-selecting the current
label would just empty the thing entirely.
So use a two-step process slightly closer to the release PRs instead:
- first update or delete the existing bump PRs
- then add the new ones
The second part is because bump PRs are somewhat less critical than
release, so it can be a bit more DWIM compared to the more deliberate
process of release PRs where first the list of repositories involved
has to be set up just so, then the PRs can be filled in each of them.
Fixes #697
2023-01-24 17:19:18 +07:00
|
|
|
commands = []
|
|
|
|
for bump_pr in self.bump_pr_ids:
|
|
|
|
p = prs.filtered(lambda p: p.repository == bump_pr.repository_id)
|
|
|
|
if len(p) == 1:
|
|
|
|
commands.append(Command.update(bump_pr.id, {'pr_id': p.id}))
|
2022-12-07 15:25:55 +07:00
|
|
|
else:
|
[FIX] runbot_merge: make freeze wizard labels lookup not shit
I DECLARE BANKRUPTCY!!!
The previous implementation of labels lookup was really not
intuitive (it was just a char field, and matched labels by equality
including the owner tag), and was also full of broken edge
cases (e.g. traceback if a label matched multiple PRs in the same repo
because people reuse branch names).
Tried messing about with contextual `display_name` and `name_search`
on PRs but the client goes wonky in that case, and there is no clean
autocomplete for non-relational fields.
So created a view which reifies labels, and that can be used as the
basis for our search. It doesn't have to be maintained by hand, can be
searched somewhat flexibly, we can add new view fields in the future
if desirable, and it seems to work fine providing a nice
understandable UX, with the reliability of using a normal Odoo model
the normal way.
Also fixed the handling of bump PRs, clearly clearing the entire field
before trying to update existing records (even with a link_to
inbetween) is not the web client's fancy, re-selecting the current
label would just empty the thing entirely.
So use a two-step process slightly closer to the release PRs instead:
- first update or delete the existing bump PRs
- then add the new ones
The second part is because bump PRs are somewhat less critical than
release, so it can be a bit more DWIM compared to the more deliberate
process of release PRs where first the list of repositories involved
has to be set up just so, then the PRs can be filled in each of them.
Fixes #697
2023-01-24 17:19:18 +07:00
|
|
|
commands.append(Command.delete(bump_pr.id))
|
|
|
|
prs -= p
|
|
|
|
|
|
|
|
commands.extend(
|
|
|
|
Command.create({'repository_id': pr.repository.id, 'pr_id': pr.id})
|
|
|
|
for pr in prs
|
|
|
|
)
|
2022-12-07 15:25:55 +07:00
|
|
|
|
[FIX] runbot_merge: make freeze wizard labels lookup not shit
I DECLARE BANKRUPTCY!!!
The previous implementation of labels lookup was really not
intuitive (it was just a char field, and matched labels by equality
including the owner tag), and was also full of broken edge
cases (e.g. traceback if a label matched multiple PRs in the same repo
because people reuse branch names).
Tried messing about with contextual `display_name` and `name_search`
on PRs but the client goes wonky in that case, and there is no clean
autocomplete for non-relational fields.
So created a view which reifies labels, and that can be used as the
basis for our search. It doesn't have to be maintained by hand, can be
searched somewhat flexibly, we can add new view fields in the future
if desirable, and it seems to work fine providing a nice
understandable UX, with the reliability of using a normal Odoo model
the normal way.
Also fixed the handling of bump PRs, clearly clearing the entire field
before trying to update existing records (even with a link_to
inbetween) is not the web client's fancy, re-selecting the current
label would just empty the thing entirely.
So use a two-step process slightly closer to the release PRs instead:
- first update or delete the existing bump PRs
- then add the new ones
The second part is because bump PRs are somewhat less critical than
release, so it can be a bit more DWIM compared to the more deliberate
process of release PRs where first the list of repositories involved
has to be set up just so, then the PRs can be filled in each of them.
Fixes #697
2023-01-24 17:19:18 +07:00
|
|
|
self.bump_pr_ids = commands
|
2022-07-11 13:17:04 +07:00
|
|
|
|
|
|
|
@api.onchange('bump_pr_ids')
|
|
|
|
def _onchange_bump_prs(self):
|
2022-12-07 15:25:55 +07:00
|
|
|
labels = {p.pr_id.label for p in self.bump_pr_ids if p.pr_id}
|
[FIX] runbot_merge: make freeze wizard labels lookup not shit
I DECLARE BANKRUPTCY!!!
The previous implementation of labels lookup was really not
intuitive (it was just a char field, and matched labels by equality
including the owner tag), and was also full of broken edge
cases (e.g. traceback if a label matched multiple PRs in the same repo
because people reuse branch names).
Tried messing about with contextual `display_name` and `name_search`
on PRs but the client goes wonky in that case, and there is no clean
autocomplete for non-relational fields.
So created a view which reifies labels, and that can be used as the
basis for our search. It doesn't have to be maintained by hand, can be
searched somewhat flexibly, we can add new view fields in the future
if desirable, and it seems to work fine providing a nice
understandable UX, with the reliability of using a normal Odoo model
the normal way.
Also fixed the handling of bump PRs, clearly clearing the entire field
before trying to update existing records (even with a link_to
inbetween) is not the web client's fancy, re-selecting the current
label would just empty the thing entirely.
So use a two-step process slightly closer to the release PRs instead:
- first update or delete the existing bump PRs
- then add the new ones
The second part is because bump PRs are somewhat less critical than
release, so it can be a bit more DWIM compared to the more deliberate
process of release PRs where first the list of repositories involved
has to be set up just so, then the PRs can be filled in each of them.
Fixes #697
2023-01-24 17:19:18 +07:00
|
|
|
self.bump_label = len(labels) == 1 and self.env['runbot_merge.freeze.labels'].search([
|
|
|
|
('label', '=', labels.pop()),
|
|
|
|
])
|
2022-07-11 13:17:04 +07:00
|
|
|
|
2021-11-12 22:04:34 +07:00
|
|
|
@api.depends('release_pr_ids.pr_id.label', 'required_pr_ids.state')
|
|
|
|
def _compute_errors(self):
|
|
|
|
errors = []
|
2022-12-07 15:25:55 +07:00
|
|
|
|
|
|
|
release_repos = Counter(self.mapped('release_pr_ids.repository_id'))
|
|
|
|
release_repos.subtract(self.project_id.repo_ids)
|
|
|
|
excess = {k.name for k, v in release_repos.items() if v > 0}
|
|
|
|
if excess:
|
|
|
|
errors.append("* Every repository must have one release PR, found multiple for %s" % ', '.join(excess))
|
|
|
|
|
2021-11-12 22:04:34 +07:00
|
|
|
without = self.release_pr_ids.filtered(lambda p: not p.pr_id)
|
|
|
|
if without:
|
|
|
|
errors.append("* Every repository must have a release PR, missing release PRs for %s." % ', '.join(
|
2022-07-11 13:17:04 +07:00
|
|
|
without.mapped('repository_id.name')
|
2021-11-12 22:04:34 +07:00
|
|
|
))
|
|
|
|
|
|
|
|
labels = set(self.mapped('release_pr_ids.pr_id.label'))
|
|
|
|
if len(labels) != 1:
|
2022-02-08 17:06:34 +07:00
|
|
|
errors.append("* All release PRs must have the same label, found %r." % ', '.join(sorted(labels)))
|
2022-07-11 13:17:04 +07:00
|
|
|
non_squash = self.mapped('release_pr_ids.pr_id').filtered(lambda p: not p.squash)
|
|
|
|
if non_squash:
|
|
|
|
errors.append("* Release PRs should have a single commit, found more in %s." % ', '.join(p.display_name for p in non_squash))
|
|
|
|
|
2022-12-07 15:25:55 +07:00
|
|
|
bump_repos = Counter(self.mapped('bump_pr_ids.repository_id'))
|
|
|
|
excess = {k.name for k, v in bump_repos.items() if v > 1}
|
|
|
|
if excess:
|
|
|
|
errors.append("* Every repository may have one bump PR, found multiple for %s" % ', '.join(excess))
|
|
|
|
|
2022-07-11 13:17:04 +07:00
|
|
|
bump_labels = set(self.mapped('bump_pr_ids.pr_id.label'))
|
|
|
|
if len(bump_labels) > 1:
|
|
|
|
errors.append("* All bump PRs must have the same label, found %r" % ', '.join(sorted(bump_labels)))
|
|
|
|
non_squash = self.mapped('bump_pr_ids.pr_id').filtered(lambda p: not p.squash)
|
|
|
|
if non_squash:
|
|
|
|
errors.append("* Bump PRs should have a single commit, found more in %s." % ', '.join(p.display_name for p in non_squash))
|
2021-11-12 22:04:34 +07:00
|
|
|
|
|
|
|
unready = sum(p.state not in ('closed', 'merged') for p in self.required_pr_ids)
|
|
|
|
if unready:
|
|
|
|
errors.append(f"* {unready} required PRs not ready.")
|
|
|
|
|
|
|
|
self.errors = '\n'.join(errors) or False
|
|
|
|
|
|
|
|
def action_cancel(self):
|
|
|
|
self.project_id.check_access_rights('write')
|
|
|
|
self.project_id.check_access_rule('write')
|
|
|
|
self.sudo().unlink()
|
|
|
|
|
|
|
|
return {'type': 'ir.actions.act_window_close'}
|
|
|
|
|
2022-02-07 19:23:41 +07:00
|
|
|
def action_open(self):
|
|
|
|
return {
|
|
|
|
'type': 'ir.actions.act_window',
|
|
|
|
'target': 'new',
|
|
|
|
'name': f'Freeze project {self.project_id.name}',
|
|
|
|
'view_mode': 'form',
|
|
|
|
'res_model': self._name,
|
|
|
|
'res_id': self.id,
|
|
|
|
}
|
|
|
|
|
2021-11-12 22:04:34 +07:00
|
|
|
def action_freeze(self):
|
|
|
|
""" Attempts to perform the freeze.
|
|
|
|
"""
|
|
|
|
# if there are still errors, reopen the wizard
|
|
|
|
if self.errors:
|
2022-02-07 19:23:41 +07:00
|
|
|
return self.action_open()
|
2021-11-12 22:04:34 +07:00
|
|
|
|
2022-07-11 13:17:04 +07:00
|
|
|
conflict_crons = self.env.ref('runbot_merge.merge_cron') | self.env.ref('runbot_merge.staging_cron')
|
|
|
|
# we don't want to run concurrently to the crons above, though we
|
|
|
|
# don't need to prevent read access to them
|
|
|
|
self.env.cr.execute(
|
|
|
|
'SELECT * FROM ir_cron WHERE id =ANY(%s) FOR SHARE NOWAIT',
|
|
|
|
[conflict_crons.ids]
|
|
|
|
)
|
|
|
|
|
2022-02-07 19:23:41 +07:00
|
|
|
project_id = self.project_id
|
2021-11-12 22:04:34 +07:00
|
|
|
# need to create the new branch, but at the same time resequence
|
|
|
|
# everything so the new branch is the second one, just after the branch
|
|
|
|
# it "forks"
|
|
|
|
master, rest = project_id.branch_ids[0], project_id.branch_ids[1:]
|
|
|
|
seq = itertools.count(start=1) # start reseq at 1
|
|
|
|
commands = [
|
|
|
|
(1, master.id, {'sequence': next(seq)}),
|
|
|
|
(0, 0, {
|
|
|
|
'name': self.branch_name,
|
|
|
|
'sequence': next(seq),
|
|
|
|
})
|
|
|
|
]
|
2022-07-11 13:17:04 +07:00
|
|
|
commands.extend((1, b.id, {'sequence': s}) for s, b in zip(seq, rest))
|
2021-11-12 22:04:34 +07:00
|
|
|
project_id.branch_ids = commands
|
2022-07-11 13:17:04 +07:00
|
|
|
master_name = master.name
|
2021-11-12 22:04:34 +07:00
|
|
|
|
2022-07-11 13:17:04 +07:00
|
|
|
gh_sessions = {r: r.github() for r in self.project_id.repo_ids}
|
2021-11-12 22:04:34 +07:00
|
|
|
|
2022-07-11 13:17:04 +07:00
|
|
|
# prep new branch (via tmp refs) on every repo
|
|
|
|
rel_heads = {}
|
|
|
|
# store for master heads as odds are high the bump pr(s) will be on the
|
|
|
|
# same repo as one of the release PRs
|
|
|
|
prevs = {}
|
2022-02-07 21:15:13 +07:00
|
|
|
for rel in self.release_pr_ids:
|
2022-07-11 13:17:04 +07:00
|
|
|
repo_id = rel.repository_id
|
|
|
|
gh = gh_sessions[repo_id]
|
|
|
|
try:
|
|
|
|
prev = prevs[repo_id] = gh.head(master_name)
|
|
|
|
except Exception:
|
|
|
|
raise UserError(f"Unable to resolve branch {master_name} of repository {repo_id.name} to a commit.")
|
|
|
|
|
|
|
|
# create the tmp branch to merge the PR into
|
|
|
|
tmp_branch = f'tmp.{self.branch_name}'
|
|
|
|
try:
|
|
|
|
gh.set_ref(tmp_branch, prev)
|
|
|
|
except Exception as err:
|
|
|
|
raise UserError(f"Unable to create branch {self.branch_name} of repository {repo_id.name}: {err}.")
|
|
|
|
|
|
|
|
rel_heads[repo_id], _ = gh.rebase(rel.pr_id.number, tmp_branch)
|
2021-11-12 22:04:34 +07:00
|
|
|
time.sleep(1)
|
|
|
|
|
2022-07-11 13:17:04 +07:00
|
|
|
# prep bump
|
|
|
|
bump_heads = {}
|
|
|
|
for bump in self.bump_pr_ids:
|
|
|
|
repo_id = bump.repository_id
|
|
|
|
gh = gh_sessions[repo_id]
|
|
|
|
|
|
|
|
try:
|
|
|
|
prev = prevs[repo_id] = prevs.get(repo_id) or gh.head(master_name)
|
|
|
|
except Exception:
|
|
|
|
raise UserError(f"Unable to resolve branch {master_name} of repository {repo_id.name} to a commit.")
|
|
|
|
|
|
|
|
# create the tmp branch to merge the PR into
|
|
|
|
tmp_branch = f'tmp.{master_name}'
|
|
|
|
try:
|
|
|
|
gh.set_ref(tmp_branch, prev)
|
|
|
|
except Exception as err:
|
|
|
|
raise UserError(f"Unable to create branch {master_name} of repository {repo_id.name}: {err}.")
|
|
|
|
|
|
|
|
bump_heads[repo_id], _ = gh.rebase(bump.pr_id.number, tmp_branch)
|
|
|
|
time.sleep(1)
|
|
|
|
|
|
|
|
deployed = {}
|
|
|
|
# at this point we've got a bunch of tmp branches with merged release
|
|
|
|
# and bump PRs, it's time to update the corresponding targets
|
|
|
|
to_delete = [] # release prs go on new branches which we try to delete on failure
|
|
|
|
to_revert = [] # bump prs go on new branch which we try to revert on failure
|
|
|
|
failure = None
|
|
|
|
for rel in self.release_pr_ids:
|
|
|
|
repo_id = rel.repository_id
|
|
|
|
# helper API currently has no API to ensure we're just creating a
|
|
|
|
# new branch (as cheaply as possible) so do it by hand
|
|
|
|
status = None
|
|
|
|
with contextlib.suppress(Exception):
|
|
|
|
status = gh_sessions[repo_id].create_ref(self.branch_name, rel_heads[repo_id])
|
|
|
|
deployed[rel.pr_id.id] = rel_heads[repo_id]
|
|
|
|
to_delete.append(repo_id)
|
|
|
|
|
|
|
|
if status != 201:
|
|
|
|
failure = ('create', repo_id.name, self.branch_name)
|
|
|
|
break
|
|
|
|
else: # all release deployments succeeded
|
|
|
|
for bump in self.bump_pr_ids:
|
|
|
|
repo_id = bump.repository_id
|
|
|
|
try:
|
|
|
|
gh_sessions[repo_id].fast_forward(master_name, bump_heads[repo_id])
|
|
|
|
deployed[bump.pr_id.id] = bump_heads[repo_id]
|
|
|
|
to_revert.append(repo_id)
|
|
|
|
except FastForwardError:
|
|
|
|
failure = ('fast-forward', repo_id.name, master_name)
|
2021-11-12 22:04:34 +07:00
|
|
|
break
|
|
|
|
|
2022-07-11 13:17:04 +07:00
|
|
|
if failure:
|
|
|
|
addendums = []
|
|
|
|
# creating the branch failed, try to delete all previous branches
|
|
|
|
failures = []
|
|
|
|
for prev_id in to_revert:
|
|
|
|
revert = gh_sessions[prev_id]('PATCH', f'git/refs/heads/{master_name}', json={
|
|
|
|
'sha': prevs[prev_id],
|
|
|
|
'force': True
|
|
|
|
}, check=False)
|
|
|
|
if not revert.ok:
|
|
|
|
failures.append(prev_id.name)
|
|
|
|
if failures:
|
|
|
|
addendums.append(
|
|
|
|
"Subsequently unable to revert branches created in %s." % \
|
|
|
|
', '.join(failures)
|
|
|
|
)
|
|
|
|
failures.clear()
|
|
|
|
|
|
|
|
for prev_id in to_delete:
|
|
|
|
deletion = gh_sessions[prev_id]('DELETE', f'git/refs/heads/{self.branch_name}', check=False)
|
2021-11-12 22:04:34 +07:00
|
|
|
if not deletion.ok:
|
2022-07-11 13:17:04 +07:00
|
|
|
failures.append(prev_id.name)
|
|
|
|
if failures:
|
|
|
|
addendums.append(
|
|
|
|
"Subsequently unable to delete branches created in %s." % \
|
|
|
|
", ".join(failures)
|
|
|
|
)
|
|
|
|
failures.clear()
|
|
|
|
|
|
|
|
if addendums:
|
|
|
|
addendum = '\n\n' + '\n'.join(addendums)
|
|
|
|
else:
|
|
|
|
addendum = ''
|
|
|
|
|
|
|
|
reason, repo, branch = failure
|
|
|
|
raise UserError(
|
|
|
|
f"Unable to {reason} branch {repo}:{branch}.{addendum}"
|
|
|
|
)
|
|
|
|
|
|
|
|
all_prs = self.release_pr_ids.pr_id | self.bump_pr_ids.pr_id
|
|
|
|
all_prs.state = 'merged'
|
|
|
|
self.env['runbot_merge.pull_requests.feedback'].create([{
|
|
|
|
'repository': pr.repository.id,
|
|
|
|
'pull_request': pr.number,
|
|
|
|
'close': True,
|
|
|
|
'message': json.dumps({
|
|
|
|
'sha': deployed[pr.id],
|
|
|
|
'base': self.branch_name if pr in self.release_pr_ids.pr_id else None
|
|
|
|
})
|
|
|
|
} for pr in all_prs])
|
2021-11-12 22:04:34 +07:00
|
|
|
|
2023-01-25 18:14:20 +07:00
|
|
|
if self.bump_pr_ids:
|
|
|
|
master.active_staging_id.cancel("freeze by %s", self.env.user.login)
|
2021-11-12 22:04:34 +07:00
|
|
|
# delete wizard
|
|
|
|
self.sudo().unlink()
|
|
|
|
# managed to create all the things, show reminder text (or close)
|
|
|
|
if project_id.freeze_reminder:
|
|
|
|
return {
|
|
|
|
'type': 'ir.actions.act_window',
|
|
|
|
'target': 'new',
|
|
|
|
'name': f'Freeze reminder {project_id.name}',
|
|
|
|
'view_mode': 'form',
|
|
|
|
'res_model': project_id._name,
|
|
|
|
'res_id': project_id.id,
|
|
|
|
'view_id': self.env.ref('runbot_merge.project_freeze_reminder').id
|
|
|
|
}
|
|
|
|
|
|
|
|
return {'type': 'ir.actions.act_window_close'}
|
|
|
|
|
|
|
|
class ReleasePullRequest(models.Model):
|
|
|
|
_name = 'runbot_merge.project.freeze.prs'
|
|
|
|
_description = "links to pull requests used to \"cap\" freezes"
|
|
|
|
|
|
|
|
wizard_id = fields.Many2one('runbot_merge.project.freeze', required=True, index=True, ondelete='cascade')
|
|
|
|
repository_id = fields.Many2one('runbot_merge.repository', required=True)
|
|
|
|
pr_id = fields.Many2one(
|
|
|
|
'runbot_merge.pull_requests',
|
|
|
|
domain='[("repository", "=", repository_id), ("state", "not in", ("closed", "merged"))]',
|
|
|
|
string="Release Pull Request",
|
|
|
|
)
|
2022-07-11 13:17:04 +07:00
|
|
|
label = fields.Char(related='pr_id.label')
|
|
|
|
|
|
|
|
def write(self, vals):
|
|
|
|
# only the pr should be writeable after initial creation
|
|
|
|
assert 'wizard_id' not in vals
|
|
|
|
assert 'repository_id' not in vals
|
|
|
|
# and if the PR gets set, it should match the requested repository
|
|
|
|
if 'pr_id' in vals:
|
|
|
|
assert self.env['runbot_merge.pull_requests'].browse(vals['pr_id'])\
|
|
|
|
.repository == self.repository_id
|
|
|
|
|
|
|
|
return super().write(vals)
|
|
|
|
|
|
|
|
class BumpPullRequest(models.Model):
|
|
|
|
_name = 'runbot_merge.project.freeze.bumps'
|
|
|
|
_description = "links to pull requests used to \"bump\" the development branches"
|
|
|
|
|
|
|
|
wizard_id = fields.Many2one('runbot_merge.project.freeze', required=True, index=True, ondelete='cascade')
|
2022-12-07 15:25:55 +07:00
|
|
|
# FIXME: repo = wizard.repo?
|
2022-07-11 13:17:04 +07:00
|
|
|
repository_id = fields.Many2one('runbot_merge.repository', required=True)
|
|
|
|
pr_id = fields.Many2one(
|
|
|
|
'runbot_merge.pull_requests',
|
|
|
|
domain='[("repository", "=", repository_id), ("state", "not in", ("closed", "merged"))]',
|
2022-12-07 15:25:55 +07:00
|
|
|
string="Bump Pull Request",
|
2022-07-11 13:17:04 +07:00
|
|
|
)
|
|
|
|
label = fields.Char(related='pr_id.label')
|
2021-11-12 22:04:34 +07:00
|
|
|
|
2022-12-07 15:25:55 +07:00
|
|
|
@api.onchange('repository_id')
|
|
|
|
def _onchange_repository(self):
|
|
|
|
self.pr_id = False
|
|
|
|
|
2021-11-12 22:04:34 +07:00
|
|
|
def write(self, vals):
|
|
|
|
# only the pr should be writeable after initial creation
|
|
|
|
assert 'wizard_id' not in vals
|
|
|
|
# and if the PR gets set, it should match the requested repository
|
2022-12-07 15:25:55 +07:00
|
|
|
if vals.get('pr_id'):
|
2021-11-12 22:04:34 +07:00
|
|
|
assert self.env['runbot_merge.pull_requests'].browse(vals['pr_id'])\
|
|
|
|
.repository == self.repository_id
|
|
|
|
|
|
|
|
return super().write(vals)
|
|
|
|
|
2022-02-07 21:15:13 +07:00
|
|
|
class RepositoryFreeze(models.Model):
|
|
|
|
_inherit = 'runbot_merge.repository'
|
|
|
|
freeze = fields.Boolean(required=True, default=True,
|
|
|
|
help="Freeze this repository by default")
|
|
|
|
|
2021-11-12 22:04:34 +07:00
|
|
|
@enum.unique
|
|
|
|
class Colors(enum.IntEnum):
|
|
|
|
No = 0
|
|
|
|
Red = 1
|
|
|
|
Orange = 2
|
|
|
|
Yellow = 3
|
|
|
|
LightBlue = 4
|
|
|
|
DarkPurple = 5
|
|
|
|
Salmon = 6
|
|
|
|
MediumBlue = 7
|
|
|
|
DarkBlue = 8
|
|
|
|
Fuchsia = 9
|
|
|
|
Green = 10
|
|
|
|
Purple = 11
|
|
|
|
|
|
|
|
STATE_COLORMAP = {
|
|
|
|
'opened': Colors.No,
|
|
|
|
'closed': Colors.Orange,
|
|
|
|
'validated': Colors.No,
|
|
|
|
'approved': Colors.No,
|
|
|
|
'ready': Colors.LightBlue,
|
|
|
|
'merged': Colors.Green,
|
|
|
|
'error': Colors.Red,
|
|
|
|
}
|
2023-01-24 13:41:14 +07:00
|
|
|
class PullRequest(models.Model):
|
2021-11-12 22:04:34 +07:00
|
|
|
_inherit = 'runbot_merge.pull_requests'
|
|
|
|
|
|
|
|
state_color = fields.Integer(compute='_compute_state_color')
|
|
|
|
|
|
|
|
@api.depends('state')
|
|
|
|
def _compute_state_color(self):
|
|
|
|
for p in self:
|
|
|
|
p.state_color = STATE_COLORMAP[p.state]
|
[FIX] runbot_merge: make freeze wizard labels lookup not shit
I DECLARE BANKRUPTCY!!!
The previous implementation of labels lookup was really not
intuitive (it was just a char field, and matched labels by equality
including the owner tag), and was also full of broken edge
cases (e.g. traceback if a label matched multiple PRs in the same repo
because people reuse branch names).
Tried messing about with contextual `display_name` and `name_search`
on PRs but the client goes wonky in that case, and there is no clean
autocomplete for non-relational fields.
So created a view which reifies labels, and that can be used as the
basis for our search. It doesn't have to be maintained by hand, can be
searched somewhat flexibly, we can add new view fields in the future
if desirable, and it seems to work fine providing a nice
understandable UX, with the reliability of using a normal Odoo model
the normal way.
Also fixed the handling of bump PRs, clearly clearing the entire field
before trying to update existing records (even with a link_to
inbetween) is not the web client's fancy, re-selecting the current
label would just empty the thing entirely.
So use a two-step process slightly closer to the release PRs instead:
- first update or delete the existing bump PRs
- then add the new ones
The second part is because bump PRs are somewhat less critical than
release, so it can be a bit more DWIM compared to the more deliberate
process of release PRs where first the list of repositories involved
has to be set up just so, then the PRs can be filled in each of them.
Fixes #697
2023-01-24 17:19:18 +07:00
|
|
|
|
|
|
|
class OpenPRLabels(models.Model):
|
|
|
|
"""Hacking around using contextual display_name to try and autocomplete
|
|
|
|
labels through PRs doesn't work because the client fucks up the display_name
|
|
|
|
(apparently they're not keyed on the context), therefore the behaviour
|
|
|
|
is inconsistent as the label shown in the autocomplete will result in the
|
|
|
|
PR being shown as its label in the o2m, and the other way around (if a PR
|
|
|
|
is selected directly in the o2m, then the PR's base display_name will be
|
|
|
|
shown in the label lookup field).
|
|
|
|
|
|
|
|
Therefore create a dumbshit view of label records.
|
|
|
|
|
|
|
|
Under the assumption that we'll have less than 256 repositories, the id of a
|
|
|
|
label record is the PR's id shifted as the high 24 bits, and the repo id as
|
|
|
|
the low 8.
|
|
|
|
"""
|
|
|
|
_name = 'runbot_merge.freeze.labels'
|
|
|
|
_description = "view representing labels for open PRs so they can autocomplete properly"
|
|
|
|
_rec_name = "label"
|
|
|
|
_auto = False
|
|
|
|
|
|
|
|
def init(self):
|
|
|
|
super().init()
|
|
|
|
drop_view_if_exists(self.env.cr, "runbot_merge_freeze_labels");
|
|
|
|
self.env.cr.execute("""
|
|
|
|
CREATE VIEW runbot_merge_freeze_labels AS (
|
|
|
|
SELECT DISTINCT ON (label)
|
|
|
|
id << 8 | repository as id,
|
|
|
|
label
|
|
|
|
FROM runbot_merge_pull_requests
|
|
|
|
WHERE state != 'merged' AND state != 'closed'
|
|
|
|
ORDER BY label, repository, id
|
|
|
|
)""")
|
|
|
|
|
|
|
|
label = fields.Char()
|