mirror of
https://github.com/odoo/runbot.git
synced 2025-03-21 18:35:45 +07:00
b0b609ebe7
The github API has gotten a lot more constraining (with rate restrictions being newly enforced or added somewhat out of nowhere), and as importantly a lot less reliable. So move the staging process off of github and locally, similar to the forward porting process (whose repo cache is being reused for this). Fixes #247
1850 lines
72 KiB
Python
1850 lines
72 KiB
Python
import ast
|
|
import collections
|
|
import contextlib
|
|
import datetime
|
|
import itertools
|
|
import json
|
|
import logging
|
|
import pprint
|
|
import re
|
|
import time
|
|
from typing import Optional, Union
|
|
|
|
import sentry_sdk
|
|
import werkzeug
|
|
|
|
from odoo import api, fields, models, tools
|
|
from odoo.exceptions import ValidationError
|
|
from odoo.osv import expression
|
|
|
|
from .. import github, exceptions, controllers, utils
|
|
|
|
_logger = logging.getLogger(__name__)
|
|
|
|
|
|
class StatusConfiguration(models.Model):
|
|
_name = 'runbot_merge.repository.status'
|
|
_description = "required statuses on repositories"
|
|
_rec_name = 'context'
|
|
_log_access = False
|
|
|
|
context = fields.Char(required=True)
|
|
repo_id = fields.Many2one('runbot_merge.repository', required=True, ondelete='cascade')
|
|
branch_filter = fields.Char(help="branches this status applies to")
|
|
prs = fields.Boolean(string="Applies to pull requests", default=True)
|
|
stagings = fields.Boolean(string="Applies to stagings", default=True)
|
|
|
|
def _for_branch(self, branch):
|
|
assert branch._name == 'runbot_merge.branch', \
|
|
f'Expected branch, got {branch}'
|
|
return self.filtered(lambda st: (
|
|
not st.branch_filter
|
|
or branch.filtered_domain(ast.literal_eval(st.branch_filter))
|
|
))
|
|
def _for_pr(self, pr):
|
|
assert pr._name == 'runbot_merge.pull_requests', \
|
|
f'Expected pull request, got {pr}'
|
|
return self._for_branch(pr.target).filtered('prs')
|
|
def _for_staging(self, staging):
|
|
assert staging._name == 'runbot_merge.stagings', \
|
|
f'Expected staging, got {staging}'
|
|
return self._for_branch(staging.target).filtered('stagings')
|
|
|
|
class Repository(models.Model):
|
|
_name = _description = 'runbot_merge.repository'
|
|
_order = 'sequence, id'
|
|
|
|
id: int
|
|
|
|
sequence = fields.Integer(default=50, group_operator=None)
|
|
name = fields.Char(required=True)
|
|
project_id = fields.Many2one('runbot_merge.project', required=True, index=True)
|
|
status_ids = fields.One2many('runbot_merge.repository.status', 'repo_id', string="Required Statuses")
|
|
|
|
group_id = fields.Many2one('res.groups', default=lambda self: self.env.ref('base.group_user'))
|
|
|
|
branch_filter = fields.Char(default='[(1, "=", 1)]', help="Filter branches valid for this repository")
|
|
substitutions = fields.Text(
|
|
"label substitutions",
|
|
help="""sed-style substitution patterns applied to the label on input, one per line.
|
|
|
|
All substitutions are tentatively applied sequentially to the input.
|
|
""")
|
|
|
|
@api.model
|
|
def create(self, vals):
|
|
if 'status_ids' in vals:
|
|
return super().create(vals)
|
|
|
|
st = vals.pop('required_statuses', 'legal/cla,ci/runbot')
|
|
if st:
|
|
vals['status_ids'] = [(0, 0, {'context': c}) for c in st.split(',')]
|
|
return super().create(vals)
|
|
|
|
def write(self, vals):
|
|
st = vals.pop('required_statuses', None)
|
|
if st:
|
|
vals['status_ids'] = [(5, 0, {})] + [(0, 0, {'context': c}) for c in st.split(',')]
|
|
return super().write(vals)
|
|
|
|
def github(self, token_field='github_token') -> github.GH:
|
|
return github.GH(self.project_id[token_field], self.name)
|
|
|
|
def _auto_init(self):
|
|
res = super(Repository, self)._auto_init()
|
|
tools.create_unique_index(
|
|
self._cr, 'runbot_merge_unique_repo', self._table, ['name'])
|
|
return res
|
|
|
|
def _load_pr(self, number):
|
|
gh = self.github()
|
|
|
|
# fetch PR object and handle as *opened*
|
|
issue, pr = gh.pr(number)
|
|
|
|
if not self.project_id._has_branch(pr['base']['ref']):
|
|
_logger.info("Tasked with loading PR %d for un-managed branch %s:%s, ignoring",
|
|
number, self.name, pr['base']['ref'])
|
|
self.env.ref('runbot_merge.pr.load.unmanaged')._send(
|
|
repository=self,
|
|
pull_request=number,
|
|
format_args = {
|
|
'pr': pr,
|
|
'repository': self,
|
|
},
|
|
)
|
|
return
|
|
|
|
# if the PR is already loaded, force sync a few attributes
|
|
pr_id = self.env['runbot_merge.pull_requests'].search([
|
|
('repository.name', '=', pr['base']['repo']['full_name']),
|
|
('number', '=', number),
|
|
])
|
|
if pr_id:
|
|
sync = controllers.handle_pr(self.env, {
|
|
'action': 'synchronize',
|
|
'pull_request': pr,
|
|
'sender': {'login': self.project_id.github_prefix}
|
|
})
|
|
edit = controllers.handle_pr(self.env, {
|
|
'action': 'edited',
|
|
'pull_request': pr,
|
|
'changes': {
|
|
'base': {'ref': {'from': pr_id.target.name}},
|
|
'title': {'from': pr_id.message.splitlines()[0]},
|
|
'body': {'from', ''.join(pr_id.message.splitlines(keepends=True)[2:])},
|
|
},
|
|
'sender': {'login': self.project_id.github_prefix},
|
|
})
|
|
edit2 = ''
|
|
if pr_id.draft != pr['draft']:
|
|
edit2 = controllers.handle_pr(self.env, {
|
|
'action': 'converted_to_draft' if pr['draft'] else 'ready_for_review',
|
|
'pull_request': pr,
|
|
'sender': {'login': self.project_id.github_prefix}
|
|
}) + '. '
|
|
self.env['runbot_merge.pull_requests.feedback'].create({
|
|
'repository': pr_id.repository.id,
|
|
'pull_request': number,
|
|
'message': f"{edit}. {edit2}{sync}.",
|
|
})
|
|
return
|
|
|
|
sender = {'login': self.project_id.github_prefix}
|
|
# init the PR to the null commit so we can later synchronise it back
|
|
# back to the "proper" head while resetting reviews
|
|
controllers.handle_pr(self.env, {
|
|
'action': 'opened',
|
|
'pull_request': {
|
|
**pr,
|
|
'head': {**pr['head'], 'sha': '0'*40},
|
|
'state': 'open',
|
|
},
|
|
'sender': sender,
|
|
})
|
|
# fetch & set up actual head
|
|
for st in gh.statuses(pr['head']['sha']):
|
|
controllers.handle_status(self.env, st)
|
|
# fetch and apply comments
|
|
counter = itertools.count()
|
|
items = [ # use counter so `comment` and `review` don't get hit during sort
|
|
(comment['created_at'], next(counter), False, comment)
|
|
for comment in gh.comments(number)
|
|
] + [
|
|
(review['submitted_at'], next(counter), True, review)
|
|
for review in gh.reviews(number)
|
|
]
|
|
items.sort()
|
|
for _, _, is_review, item in items:
|
|
if is_review:
|
|
controllers.handle_review(self.env, {
|
|
'action': 'submitted',
|
|
'review': item,
|
|
'pull_request': pr,
|
|
'repository': {'full_name': self.name},
|
|
'sender': sender,
|
|
})
|
|
else:
|
|
controllers.handle_comment(self.env, {
|
|
'action': 'created',
|
|
'issue': issue,
|
|
'comment': item,
|
|
'repository': {'full_name': self.name},
|
|
'sender': sender,
|
|
})
|
|
# sync to real head
|
|
controllers.handle_pr(self.env, {
|
|
'action': 'synchronize',
|
|
'pull_request': pr,
|
|
'sender': sender,
|
|
})
|
|
pr_id = self.env['runbot_merge.pull_requests'].search([
|
|
('repository.name', '=', pr['base']['repo']['full_name']),
|
|
('number', '=', number),
|
|
])
|
|
if pr['state'] == 'closed':
|
|
# don't go through controller because try_closing does weird things
|
|
# for safety / race condition reasons which ends up committing
|
|
# and breaks everything
|
|
pr_id.state = 'closed'
|
|
|
|
self.env.ref('runbot_merge.pr.load.fetched')._send(
|
|
repository=self,
|
|
pull_request=number,
|
|
format_args={'pr': pr_id},
|
|
)
|
|
|
|
def having_branch(self, branch):
|
|
branches = self.env['runbot_merge.branch'].search
|
|
return self.filtered(lambda r: branch in branches(ast.literal_eval(r.branch_filter)))
|
|
|
|
def _remap_label(self, label):
|
|
for line in filter(None, (self.substitutions or '').splitlines()):
|
|
sep = line[0]
|
|
_, pattern, repl, flags = line.split(sep)
|
|
label = re.sub(
|
|
pattern, repl, label,
|
|
count=0 if 'g' in flags else 1,
|
|
flags=(re.MULTILINE if 'm' in flags.lower() else 0)
|
|
| (re.IGNORECASE if 'i' in flags.lower() else 0)
|
|
)
|
|
return label
|
|
|
|
class Branch(models.Model):
|
|
_name = _description = 'runbot_merge.branch'
|
|
_order = 'sequence, name'
|
|
|
|
id: int
|
|
|
|
name = fields.Char(required=True)
|
|
project_id = fields.Many2one('runbot_merge.project', required=True, index=True)
|
|
|
|
active_staging_id = fields.Many2one(
|
|
'runbot_merge.stagings', compute='_compute_active_staging', store=True, index=True,
|
|
help="Currently running staging for the branch."
|
|
)
|
|
staging_ids = fields.One2many('runbot_merge.stagings', 'target')
|
|
split_ids = fields.One2many('runbot_merge.split', 'target')
|
|
|
|
prs = fields.One2many('runbot_merge.pull_requests', 'target', domain=[
|
|
('state', '!=', 'closed'),
|
|
('state', '!=', 'merged'),
|
|
])
|
|
|
|
active = fields.Boolean(default=True)
|
|
sequence = fields.Integer(group_operator=None)
|
|
|
|
staging_enabled = fields.Boolean(default=True)
|
|
|
|
def _auto_init(self):
|
|
res = super(Branch, self)._auto_init()
|
|
tools.create_unique_index(
|
|
self._cr, 'runbot_merge_unique_branch_per_repo',
|
|
self._table, ['name', 'project_id'])
|
|
return res
|
|
|
|
@api.depends('active')
|
|
def _compute_display_name(self):
|
|
super()._compute_display_name()
|
|
for b in self.filtered(lambda b: not b.active):
|
|
b.display_name += ' (inactive)'
|
|
|
|
def write(self, vals):
|
|
super().write(vals)
|
|
if vals.get('active') is False:
|
|
self.active_staging_id.cancel(
|
|
"Target branch deactivated by %r.",
|
|
self.env.user.login,
|
|
)
|
|
tmpl = self.env.ref('runbot_merge.pr.branch.disabled')
|
|
self.env['runbot_merge.pull_requests.feedback'].create([{
|
|
'repository': pr.repository.id,
|
|
'pull_request': pr.number,
|
|
'message': tmpl._format(pr=pr),
|
|
} for pr in self.prs])
|
|
return True
|
|
|
|
@api.depends('staging_ids.active')
|
|
def _compute_active_staging(self):
|
|
for b in self:
|
|
b.active_staging_id = b.with_context(active_test=True).staging_ids
|
|
|
|
|
|
ACL = collections.namedtuple('ACL', 'is_admin is_reviewer is_author')
|
|
class PullRequests(models.Model):
|
|
_name = _description = 'runbot_merge.pull_requests'
|
|
_order = 'number desc'
|
|
_rec_name = 'number'
|
|
|
|
id: int
|
|
display_name: str
|
|
|
|
target = fields.Many2one('runbot_merge.branch', required=True, index=True)
|
|
repository = fields.Many2one('runbot_merge.repository', required=True)
|
|
# NB: check that target & repo have same project & provide project related?
|
|
|
|
state = fields.Selection([
|
|
('opened', 'Opened'),
|
|
('closed', 'Closed'),
|
|
('validated', 'Validated'),
|
|
('approved', 'Approved'),
|
|
('ready', 'Ready'),
|
|
# staged?
|
|
('merged', 'Merged'),
|
|
('error', 'Error'),
|
|
], default='opened', index=True)
|
|
|
|
number = fields.Integer(required=True, index=True, group_operator=None)
|
|
author = fields.Many2one('res.partner', index=True)
|
|
head = fields.Char(required=True)
|
|
label = fields.Char(
|
|
required=True, index=True,
|
|
help="Label of the source branch (owner:branchname), used for "
|
|
"cross-repository branch-matching"
|
|
)
|
|
message = fields.Text(required=True)
|
|
draft = fields.Boolean(default=False, required=True)
|
|
squash = fields.Boolean(default=False)
|
|
merge_method = fields.Selection([
|
|
('merge', "merge directly, using the PR as merge commit message"),
|
|
('rebase-merge', "rebase and merge, using the PR as merge commit message"),
|
|
('rebase-ff', "rebase and fast-forward"),
|
|
('squash', "squash"),
|
|
], default=False)
|
|
method_warned = fields.Boolean(default=False)
|
|
|
|
reviewed_by = fields.Many2one('res.partner', index=True)
|
|
delegates = fields.Many2many('res.partner', help="Delegate reviewers, not intrinsically reviewers but can review this PR")
|
|
priority = fields.Integer(default=2, index=True, group_operator=None)
|
|
|
|
overrides = fields.Char(required=True, default='{}')
|
|
statuses = fields.Text(
|
|
compute='_compute_statuses',
|
|
help="Copy of the statuses from the HEAD commit, as a Python literal"
|
|
)
|
|
statuses_full = fields.Text(
|
|
compute='_compute_statuses',
|
|
help="Compilation of the full status of the PR (commit statuses + overrides), as JSON"
|
|
)
|
|
status = fields.Char(compute='_compute_statuses')
|
|
previous_failure = fields.Char(default='{}')
|
|
|
|
batch_id = fields.Many2one('runbot_merge.batch', string="Active Batch", compute='_compute_active_batch', store=True)
|
|
batch_ids = fields.Many2many('runbot_merge.batch', string="Batches", context={'active_test': False})
|
|
staging_id = fields.Many2one(related='batch_id.staging_id', store=True)
|
|
commits_map = fields.Char(help="JSON-encoded mapping of PR commits to actually integrated commits. The integration head (either a merge commit or the PR's topmost) is mapped from the 'empty' pr commit (the key is an empty string, because you can't put a null key in json maps).", default='{}')
|
|
|
|
link_warned = fields.Boolean(
|
|
default=False, help="Whether we've already warned that this (ready)"
|
|
" PR is linked to an other non-ready PR"
|
|
)
|
|
|
|
blocked = fields.Char(
|
|
compute='_compute_is_blocked',
|
|
help="PR is not currently stageable for some reason (mostly an issue if status is ready)"
|
|
)
|
|
|
|
url = fields.Char(compute='_compute_url')
|
|
github_url = fields.Char(compute='_compute_url')
|
|
|
|
repo_name = fields.Char(related='repository.name')
|
|
message_title = fields.Char(compute='_compute_message_title')
|
|
|
|
ping = fields.Char(compute='_compute_ping')
|
|
|
|
@api.depends('author.github_login', 'reviewed_by.github_login')
|
|
def _compute_ping(self):
|
|
for pr in self:
|
|
s = ' '.join(
|
|
f'@{p.github_login}'
|
|
for p in (pr.author | pr.reviewed_by )
|
|
)
|
|
pr.ping = s and (s + ' ')
|
|
|
|
@api.depends('repository.name', 'number')
|
|
def _compute_url(self):
|
|
base = werkzeug.urls.url_parse(self.env['ir.config_parameter'].sudo().get_param('web.base.url', 'http://localhost:8069'))
|
|
gh_base = werkzeug.urls.url_parse('https://github.com')
|
|
for pr in self:
|
|
path = f'/{werkzeug.urls.url_quote(pr.repository.name)}/pull/{pr.number}'
|
|
pr.url = str(base.join(path))
|
|
pr.github_url = str(gh_base.join(path))
|
|
|
|
@api.depends('message')
|
|
def _compute_message_title(self):
|
|
for pr in self:
|
|
pr.message_title = next(iter(pr.message.splitlines()), '')
|
|
|
|
@api.depends('repository.name', 'number', 'message')
|
|
def _compute_display_name(self):
|
|
return super(PullRequests, self)._compute_display_name()
|
|
|
|
def name_get(self):
|
|
name_template = '%(repo_name)s#%(number)d'
|
|
if self.env.context.get('pr_include_title'):
|
|
name_template += ' (%(message_title)s)'
|
|
return [(p.id, name_template % p) for p in self]
|
|
|
|
@api.model
|
|
def name_search(self, name='', args=None, operator='ilike', limit=100):
|
|
if not name or operator != 'ilike':
|
|
return super().name_search(name, args=args, operator=operator, limit=limit)
|
|
bits = [[('label', 'ilike', name)]]
|
|
if name.isdigit():
|
|
bits.append([('number', '=', name)])
|
|
if re.match(r'\w+#\d+$', name):
|
|
repo, num = name.rsplit('#', 1)
|
|
bits.append(['&', ('repository.name', 'ilike', repo), ('number', '=', int(num))])
|
|
else:
|
|
bits.append([('repository.name', 'ilike', name)])
|
|
domain = expression.OR(bits)
|
|
if args:
|
|
domain = expression.AND([args, domain])
|
|
return self.search(domain, limit=limit).sudo().name_get()
|
|
|
|
@property
|
|
def _approved(self):
|
|
return self.state in ('approved', 'ready') or any(
|
|
p.priority == 0
|
|
for p in (self | self._linked_prs)
|
|
)
|
|
|
|
@property
|
|
def _ready(self):
|
|
return (self.squash or self.merge_method) and self._approved and self.status == 'success'
|
|
|
|
@property
|
|
def _linked_prs(self):
|
|
if re.search(r':patch-\d+', self.label):
|
|
return self.browse(())
|
|
if self.state == 'merged':
|
|
return self.with_context(active_test=False).batch_ids\
|
|
.filtered(lambda b: b.staging_id.state == 'success')\
|
|
.prs - self
|
|
return self.search([
|
|
('target', '=', self.target.id),
|
|
('label', '=', self.label),
|
|
('state', 'not in', ('merged', 'closed')),
|
|
]) - self
|
|
|
|
# missing link to other PRs
|
|
@api.depends('priority', 'state', 'squash', 'merge_method', 'batch_id.active', 'label')
|
|
def _compute_is_blocked(self):
|
|
self.blocked = False
|
|
for pr in self:
|
|
if pr.state in ('merged', 'closed'):
|
|
continue
|
|
|
|
linked = pr._linked_prs
|
|
# check if PRs are configured (single commit or merge method set)
|
|
if not (pr.squash or pr.merge_method):
|
|
pr.blocked = 'has no merge method'
|
|
continue
|
|
other_unset = next((p for p in linked if not (p.squash or p.merge_method)), None)
|
|
if other_unset:
|
|
pr.blocked = "linked PR %s has no merge method" % other_unset.display_name
|
|
continue
|
|
|
|
# check if any PR in the batch is p=0 and none is in error
|
|
if any(p.priority == 0 for p in (pr | linked)):
|
|
if pr.state == 'error':
|
|
pr.blocked = "in error"
|
|
other_error = next((p for p in linked if p.state == 'error'), None)
|
|
if other_error:
|
|
pr.blocked = "linked pr %s in error" % other_error.display_name
|
|
# if none is in error then none is blocked because p=0
|
|
# "unblocks" the entire batch
|
|
continue
|
|
|
|
if pr.state != 'ready':
|
|
pr.blocked = 'not ready'
|
|
continue
|
|
|
|
unready = next((p for p in linked if p.state != 'ready'), None)
|
|
if unready:
|
|
pr.blocked = 'linked pr %s is not ready' % unready.display_name
|
|
continue
|
|
|
|
def _get_overrides(self):
|
|
if self:
|
|
return json.loads(self.overrides)
|
|
return {}
|
|
|
|
@api.depends('head', 'repository.status_ids', 'overrides')
|
|
def _compute_statuses(self):
|
|
Commits = self.env['runbot_merge.commit']
|
|
for pr in self:
|
|
c = Commits.search([('sha', '=', pr.head)])
|
|
st = json.loads(c.statuses or '{}')
|
|
statuses = {**st, **pr._get_overrides()}
|
|
pr.statuses_full = json.dumps(statuses)
|
|
if not statuses:
|
|
pr.status = pr.statuses = False
|
|
continue
|
|
|
|
pr.statuses = pprint.pformat(st)
|
|
|
|
st = 'success'
|
|
for ci in pr.repository.status_ids._for_pr(pr):
|
|
v = (statuses.get(ci.context) or {'state': 'pending'})['state']
|
|
if v in ('error', 'failure'):
|
|
st = 'failure'
|
|
break
|
|
if v == 'pending':
|
|
st = 'pending'
|
|
pr.status = st
|
|
|
|
@api.depends('batch_ids.active')
|
|
def _compute_active_batch(self):
|
|
for r in self:
|
|
r.batch_id = r.batch_ids.filtered(lambda b: b.active)[:1]
|
|
|
|
def _get_or_schedule(self, repo_name, number, target=None):
|
|
repo = self.env['runbot_merge.repository'].search([('name', '=', repo_name)])
|
|
if not repo:
|
|
return
|
|
|
|
if target and not repo.project_id._has_branch(target):
|
|
self.env.ref('runbot_merge.pr.fetch.unmanaged')._send(
|
|
repository=repo,
|
|
pull_request=number,
|
|
format_args={'repository': repo, 'branch': target, 'number': number}
|
|
)
|
|
return
|
|
|
|
pr = self.search([
|
|
('repository', '=', repo.id),
|
|
('number', '=', number,)
|
|
])
|
|
if pr:
|
|
return pr
|
|
|
|
Fetch = self.env['runbot_merge.fetch_job']
|
|
if Fetch.search([('repository', '=', repo.id), ('number', '=', number)]):
|
|
return
|
|
Fetch.create({
|
|
'repository': repo.id,
|
|
'number': number,
|
|
})
|
|
|
|
def _parse_command(self, commandstring):
|
|
for m in re.finditer(
|
|
r'(\S+?)(?:([+-])|=(\S*))?(?=\s|$)',
|
|
commandstring,
|
|
):
|
|
name, flag, param = m.groups()
|
|
if name == 'r':
|
|
name = 'review'
|
|
if flag in ('+', '-'):
|
|
yield name, flag == '+'
|
|
elif name == 'delegate':
|
|
if param:
|
|
for p in param.split(','):
|
|
yield 'delegate', p.lstrip('#@')
|
|
elif name == 'override':
|
|
if param:
|
|
for p in param.split(','):
|
|
yield 'override', p
|
|
elif name in ('p', 'priority'):
|
|
if param in ('0', '1', '2'):
|
|
yield ('priority', int(param))
|
|
elif any(name == k for k, _ in type(self).merge_method.selection):
|
|
yield ('method', name)
|
|
else:
|
|
yield name, param
|
|
|
|
def _parse_commands(self, author, comment, login):
|
|
"""Parses a command string prefixed by Project::github_prefix.
|
|
|
|
A command string can contain any number of space-separated commands:
|
|
|
|
retry
|
|
resets a PR in error mode to ready for staging
|
|
r(eview)+/-
|
|
approves or disapproves a PR (disapproving just cancels an approval)
|
|
delegate+/delegate=<users>
|
|
adds either PR author or the specified (github) users as
|
|
authorised reviewers for this PR. ``<users>`` is a
|
|
comma-separated list of github usernames (no @)
|
|
p(riority)=2|1|0
|
|
sets the priority to normal (2), pressing (1) or urgent (0).
|
|
Lower-priority PRs are selected first and batched together.
|
|
rebase+/-
|
|
Whether the PR should be rebased-and-merged (the default) or just
|
|
merged normally.
|
|
"""
|
|
assert self, "parsing commands must be executed in an actual PR"
|
|
|
|
(login, name) = (author.github_login, author.display_name) if author else (login, 'not in system')
|
|
|
|
is_admin, is_reviewer, is_author = self._pr_acl(author)
|
|
|
|
commands = [
|
|
ps
|
|
for m in self.repository.project_id._find_commands(comment['body'] or '')
|
|
for ps in self._parse_command(m)
|
|
]
|
|
|
|
if not commands:
|
|
_logger.info("found no commands in comment of %s (%s) (%s)", author.github_login, author.display_name,
|
|
utils.shorten(comment['body'] or '', 50)
|
|
)
|
|
return 'ok'
|
|
|
|
if not (is_author or any(cmd == 'override' for cmd, _ in commands)):
|
|
# no point even parsing commands
|
|
_logger.info("ignoring comment of %s (%s): no ACL to %s",
|
|
login, name, self.display_name)
|
|
self.env.ref('runbot_merge.command.access.no')._send(
|
|
repository=self.repository,
|
|
pull_request=self.number,
|
|
format_args={'user': login, 'pr': self}
|
|
)
|
|
return 'ignored'
|
|
|
|
applied, ignored = [], []
|
|
def reformat(command, param):
|
|
if param is None:
|
|
pstr = ''
|
|
elif isinstance(param, bool):
|
|
pstr = '+' if param else '-'
|
|
elif isinstance(param, list):
|
|
pstr = '=' + ','.join(param)
|
|
else:
|
|
pstr = '={}'.format(param)
|
|
|
|
return '%s%s' % (command, pstr)
|
|
msgs = []
|
|
for command, param in commands:
|
|
ok = False
|
|
msg = None
|
|
if command == 'retry':
|
|
if is_author:
|
|
if self.state == 'error':
|
|
ok = True
|
|
self.state = 'ready'
|
|
else:
|
|
msg = "retry makes no sense when the PR is not in error."
|
|
elif command == 'check':
|
|
if is_author:
|
|
self.env['runbot_merge.fetch_job'].create({
|
|
'repository': self.repository.id,
|
|
'number': self.number,
|
|
})
|
|
ok = True
|
|
elif command == 'review':
|
|
if self.draft:
|
|
msg = "draft PRs can not be approved."
|
|
elif param and is_reviewer:
|
|
oldstate = self.state
|
|
newstate = RPLUS.get(self.state)
|
|
if not author.email:
|
|
msg = "I must know your email before you can review PRs. Please contact an administrator."
|
|
elif not newstate:
|
|
msg = "this PR is already reviewed, reviewing it again is useless."
|
|
else:
|
|
self.state = newstate
|
|
self.reviewed_by = author
|
|
ok = True
|
|
_logger.debug(
|
|
"r+ on %s by %s (%s->%s) status=%s message? %s",
|
|
self.display_name, author.github_login,
|
|
oldstate, newstate or oldstate,
|
|
self.status, self.status == 'failure'
|
|
)
|
|
if self.status == 'failure':
|
|
# the normal infrastructure is for failure and
|
|
# prefixes messages with "I'm sorry"
|
|
self.env.ref("runbot_merge.command.approve.failure")._send(
|
|
repository=self.repository,
|
|
pull_request=self.number,
|
|
format_args={'user': login, 'pr': self},
|
|
)
|
|
elif not param and is_author:
|
|
newstate = RMINUS.get(self.state)
|
|
if self.priority == 0 or newstate:
|
|
if newstate:
|
|
self.state = newstate
|
|
if self.priority == 0:
|
|
self.priority = 1
|
|
self.env.ref("runbot_merge.command.unapprove.p0")._send(
|
|
repository=self.repository,
|
|
pull_request=self.number,
|
|
format_args={'user': login, 'pr': self},
|
|
)
|
|
self.unstage("unreviewed (r-) by %s", login)
|
|
ok = True
|
|
else:
|
|
msg = "r- makes no sense in the current PR state."
|
|
elif command == 'delegate':
|
|
if is_reviewer:
|
|
ok = True
|
|
Partners = self.env['res.partner']
|
|
if param is True:
|
|
delegate = self.author
|
|
else:
|
|
delegate = Partners.search([('github_login', '=', param)]) or Partners.create({
|
|
'name': param,
|
|
'github_login': param,
|
|
})
|
|
delegate.write({'delegate_reviewer': [(4, self.id, 0)]})
|
|
elif command == 'priority':
|
|
if is_admin:
|
|
ok = True
|
|
self.priority = param
|
|
if param == 0:
|
|
self.target.active_staging_id.cancel(
|
|
"P=0 on %s by %s, unstaging target %s",
|
|
self.display_name,
|
|
author.github_login, self.target.name,
|
|
)
|
|
elif command == 'method':
|
|
if is_reviewer:
|
|
self.merge_method = param
|
|
ok = True
|
|
explanation = next(label for value, label in type(self).merge_method.selection if value == param)
|
|
self.env.ref("runbot_merge.command.method")._send(
|
|
repository=self.repository,
|
|
pull_request=self.number,
|
|
format_args={'new_method': explanation, 'pr': self, 'user': login},
|
|
)
|
|
elif command == 'override':
|
|
overridable = author.override_rights\
|
|
.filtered(lambda r: not r.repository_id or (r.repository_id == self.repository))\
|
|
.mapped('context')
|
|
if param in overridable:
|
|
self.overrides = json.dumps({
|
|
**json.loads(self.overrides),
|
|
param: {
|
|
'state': 'success',
|
|
'target_url': comment['html_url'],
|
|
'description': f"Overridden by @{author.github_login}",
|
|
},
|
|
})
|
|
c = self.env['runbot_merge.commit'].search([('sha', '=', self.head)])
|
|
if c:
|
|
c.to_check = True
|
|
else:
|
|
c.create({'sha': self.head, 'statuses': '{}'})
|
|
ok = True
|
|
else:
|
|
msg = "you are not allowed to override this status."
|
|
else:
|
|
# ignore unknown commands
|
|
continue
|
|
|
|
_logger.info(
|
|
"%s %s(%s) on %s by %s (%s)",
|
|
"applied" if ok else "ignored",
|
|
command, param, self.display_name,
|
|
author.github_login, author.display_name,
|
|
)
|
|
if ok:
|
|
applied.append(reformat(command, param))
|
|
else:
|
|
ignored.append(reformat(command, param))
|
|
msgs.append(msg or "you can't {}.".format(reformat(command, param)))
|
|
|
|
if msgs:
|
|
joiner = ' ' if len(msgs) == 1 else '\n- '
|
|
msgs.insert(0, "I'm sorry, @{}:".format(login))
|
|
self.env['runbot_merge.pull_requests.feedback'].create({
|
|
'repository': self.repository.id,
|
|
'pull_request': self.number,
|
|
'message': joiner.join(msgs),
|
|
})
|
|
|
|
msg = []
|
|
if applied:
|
|
msg.append('applied ' + ' '.join(applied))
|
|
if ignored:
|
|
ignoredstr = ' '.join(ignored)
|
|
msg.append('ignored ' + ignoredstr)
|
|
return '\n'.join(msg)
|
|
|
|
def _pr_acl(self, user):
|
|
if not self:
|
|
return ACL(False, False, False)
|
|
|
|
is_admin = self.env['res.partner.review'].search_count([
|
|
('partner_id', '=', user.id),
|
|
('repository_id', '=', self.repository.id),
|
|
('review', '=', True) if self.author != user else ('self_review', '=', True),
|
|
]) == 1
|
|
is_reviewer = is_admin or self in user.delegate_reviewer
|
|
# TODO: should delegate reviewers be able to retry PRs?
|
|
is_author = is_reviewer or self.author == user
|
|
return ACL(is_admin, is_reviewer, is_author)
|
|
|
|
def _validate(self, statuses):
|
|
# could have two PRs (e.g. one open and one closed) at least
|
|
# temporarily on the same head, or on the same head with different
|
|
# targets
|
|
failed = self.browse(())
|
|
for pr in self:
|
|
required = pr.repository.status_ids._for_pr(pr).mapped('context')
|
|
sts = {**statuses, **pr._get_overrides()}
|
|
|
|
success = True
|
|
for ci in required:
|
|
status = sts.get(ci) or {'state': 'pending'}
|
|
result = status['state']
|
|
if result == 'success':
|
|
continue
|
|
|
|
success = False
|
|
if result in ('error', 'failure'):
|
|
failed |= pr
|
|
pr._notify_ci_new_failure(ci, status)
|
|
if success:
|
|
oldstate = pr.state
|
|
if oldstate == 'opened':
|
|
pr.state = 'validated'
|
|
elif oldstate == 'approved':
|
|
pr.state = 'ready'
|
|
return failed
|
|
|
|
def _notify_ci_new_failure(self, ci, st):
|
|
prev = json.loads(self.previous_failure)
|
|
if not any(self._statuses_equivalent(st, v) for v in prev.values()):
|
|
prev[ci] = st
|
|
self.previous_failure = json.dumps(prev)
|
|
self._notify_ci_failed(ci)
|
|
|
|
def _notify_merged(self, gh, payload):
|
|
deployment = gh('POST', 'deployments', json={
|
|
'ref': self.head, 'environment': 'merge',
|
|
'description': "Merge %s into %s" % (self.display_name, self.target.name),
|
|
'task': 'merge',
|
|
'auto_merge': False,
|
|
'required_contexts': [],
|
|
}).json()
|
|
gh('POST', 'deployments/{}/statuses'.format(deployment['id']), json={
|
|
'state': 'success',
|
|
'target_url': 'https://github.com/{}/commit/{}'.format(
|
|
self.repository.name,
|
|
payload['sha'],
|
|
),
|
|
'description': "Merged %s in %s at %s" % (
|
|
self.display_name, self.target.name, payload['sha']
|
|
)
|
|
})
|
|
|
|
def _statuses_equivalent(self, a, b):
|
|
""" Check if two statuses are *equivalent* meaning the description field
|
|
is ignored (check only state and target_url). This is because the
|
|
description seems to vary even if the rest does not, and generates
|
|
unnecessary notififcations as a result
|
|
"""
|
|
return a.get('state') == b.get('state') \
|
|
and a.get('target_url') == b.get('target_url')
|
|
|
|
def _notify_ci_failed(self, ci):
|
|
# only report an issue of the PR is already approved (r+'d)
|
|
if self.state == 'approved':
|
|
self.env.ref("runbot_merge.failure.approved")._send(
|
|
repository=self.repository,
|
|
pull_request=self.number,
|
|
format_args={'pr': self, 'status': ci}
|
|
)
|
|
|
|
def _auto_init(self):
|
|
super(PullRequests, self)._auto_init()
|
|
# incorrect index: unique(number, target, repository).
|
|
tools.drop_index(self._cr, 'runbot_merge_unique_pr_per_target', self._table)
|
|
# correct index:
|
|
tools.create_unique_index(
|
|
self._cr, 'runbot_merge_unique_pr_per_repo', self._table, ['repository', 'number'])
|
|
self._cr.execute("CREATE INDEX IF NOT EXISTS runbot_merge_pr_head "
|
|
"ON runbot_merge_pull_requests "
|
|
"USING hash (head)")
|
|
|
|
@property
|
|
def _tagstate(self):
|
|
if self.state == 'ready' and self.staging_id.heads:
|
|
return 'staged'
|
|
return self.state
|
|
|
|
@api.model
|
|
def create(self, vals):
|
|
pr = super().create(vals)
|
|
c = self.env['runbot_merge.commit'].search([('sha', '=', pr.head)])
|
|
pr._validate(json.loads(c.statuses or '{}'))
|
|
|
|
if pr.state not in ('closed', 'merged'):
|
|
self.env.ref('runbot_merge.pr.created')._send(
|
|
repository=pr.repository,
|
|
pull_request=pr.number,
|
|
format_args={'pr': pr},
|
|
)
|
|
return pr
|
|
|
|
def _from_gh(self, description, author=None, branch=None, repo=None):
|
|
if repo is None:
|
|
repo = self.env['runbot_merge.repository'].search([
|
|
('name', '=', description['base']['repo']['full_name']),
|
|
])
|
|
if branch is None:
|
|
branch = self.env['runbot_merge.branch'].with_context(active_test=False).search([
|
|
('name', '=', description['base']['ref']),
|
|
('project_id', '=', repo.project_id.id),
|
|
])
|
|
if author is None:
|
|
author = self.env['res.partner'].search([
|
|
('github_login', '=', description['user']['login']),
|
|
], limit=1)
|
|
|
|
return self.env['runbot_merge.pull_requests'].create({
|
|
'state': 'opened' if description['state'] == 'open' else 'closed',
|
|
'number': description['number'],
|
|
'label': repo._remap_label(description['head']['label']),
|
|
'author': author.id,
|
|
'target': branch.id,
|
|
'repository': repo.id,
|
|
'head': description['head']['sha'],
|
|
'squash': description['commits'] == 1,
|
|
'message': utils.make_message(description),
|
|
'draft': description['draft'],
|
|
})
|
|
|
|
def write(self, vals):
|
|
if vals.get('squash'):
|
|
vals['merge_method'] = False
|
|
prev = None
|
|
if 'target' in vals or 'message' in vals:
|
|
prev = {
|
|
pr.id: {'target': pr.target, 'message': pr.message}
|
|
for pr in self
|
|
}
|
|
|
|
w = super().write(vals)
|
|
|
|
newhead = vals.get('head')
|
|
if newhead:
|
|
c = self.env['runbot_merge.commit'].search([('sha', '=', newhead)])
|
|
self._validate(json.loads(c.statuses or '{}'))
|
|
|
|
if prev:
|
|
for pr in self:
|
|
old_target = prev[pr.id]['target']
|
|
if pr.target != old_target:
|
|
pr.unstage(
|
|
"target (base) branch was changed from %r to %r",
|
|
old_target.display_name, pr.target.display_name,
|
|
)
|
|
old_message = prev[pr.id]['message']
|
|
if pr.merge_method not in (False, 'rebase-ff') and pr.message != old_message:
|
|
pr.unstage("merge message updated")
|
|
return w
|
|
|
|
def _check_linked_prs_statuses(self, commit=False):
|
|
""" Looks for linked PRs where at least one of the PRs is in a ready
|
|
state and the others are not, notifies the other PRs.
|
|
|
|
:param bool commit: whether to commit the tnx after each comment
|
|
"""
|
|
# similar to Branch.try_staging's query as it's a subset of that
|
|
# other query's behaviour
|
|
self.env.cr.execute("""
|
|
SELECT
|
|
array_agg(pr.id) AS match
|
|
FROM runbot_merge_pull_requests pr
|
|
WHERE
|
|
-- exclude terminal states (so there's no issue when
|
|
-- deleting branches & reusing labels)
|
|
pr.state != 'merged'
|
|
AND pr.state != 'closed'
|
|
GROUP BY
|
|
pr.target,
|
|
CASE
|
|
WHEN pr.label SIMILAR TO '%%:patch-[[:digit:]]+'
|
|
THEN pr.id::text
|
|
ELSE pr.label
|
|
END
|
|
HAVING
|
|
-- one of the batch's PRs should be ready & not marked
|
|
bool_or(pr.state = 'ready' AND NOT pr.link_warned)
|
|
-- one of the others should be unready
|
|
AND bool_or(pr.state != 'ready')
|
|
-- but ignore batches with one of the prs at p0
|
|
AND bool_and(pr.priority != 0)
|
|
""")
|
|
for [ids] in self.env.cr.fetchall():
|
|
prs = self.browse(ids)
|
|
ready = prs.filtered(lambda p: p.state == 'ready')
|
|
unready = (prs - ready).sorted(key=lambda p: (p.repository.name, p.number))
|
|
|
|
for r in ready:
|
|
self.env.ref('runbot_merge.pr.linked.not_ready')._send(
|
|
repository=r.repository,
|
|
pull_request=r.number,
|
|
format_args={
|
|
'pr': r,
|
|
'siblings': ', '.join(map('{0.display_name}'.format, unready))
|
|
},
|
|
)
|
|
r.link_warned = True
|
|
if commit:
|
|
self.env.cr.commit()
|
|
|
|
# send feedback for multi-commit PRs without a merge_method (which
|
|
# we've not warned yet)
|
|
methods = ''.join(
|
|
'* `%s` to %s\n' % pair
|
|
for pair in type(self).merge_method.selection
|
|
if pair[0] != 'squash'
|
|
)
|
|
for r in self.search([
|
|
('state', '=', 'ready'),
|
|
('squash', '=', False),
|
|
('merge_method', '=', False),
|
|
('method_warned', '=', False),
|
|
]):
|
|
self.env.ref('runbot_merge.pr.merge_method')._send(
|
|
repository=r.repository,
|
|
pull_request=r.number,
|
|
format_args={'pr': r, 'methods':methods},
|
|
)
|
|
r.method_warned = True
|
|
if commit:
|
|
self.env.cr.commit()
|
|
|
|
def _build_merge_message(self, message: Union['PullRequests', str], related_prs=()) -> 'Message':
|
|
# handle co-authored commits (https://help.github.com/articles/creating-a-commit-with-multiple-authors/)
|
|
m = Message.from_message(message)
|
|
if not is_mentioned(message, self):
|
|
m.body += f'\n\ncloses {self.display_name}'
|
|
|
|
for r in related_prs:
|
|
if not is_mentioned(message, r, full_reference=True):
|
|
m.headers.add('Related', r.display_name)
|
|
|
|
if self.reviewed_by:
|
|
m.headers.add('signed-off-by', self.reviewed_by.formatted_email)
|
|
|
|
return m
|
|
|
|
def unstage(self, reason, *args):
|
|
""" If the PR is staged, cancel the staging. If the PR is split and
|
|
waiting, remove it from the split (possibly delete the split entirely)
|
|
"""
|
|
split_batches = self.with_context(active_test=False).mapped('batch_ids').filtered('split_id')
|
|
if len(split_batches) > 1:
|
|
_logger.warning("Found a PR linked with more than one split batch: %s (%s)", self, split_batches)
|
|
for b in split_batches:
|
|
if len(b.split_id.batch_ids) == 1:
|
|
# only the batch of this PR -> delete split
|
|
b.split_id.unlink()
|
|
else:
|
|
# else remove this batch from the split
|
|
b.split_id = False
|
|
|
|
self.staging_id.cancel('%s ' + reason, self.display_name, *args)
|
|
|
|
def _try_closing(self, by):
|
|
# ignore if the PR is already being updated in a separate transaction
|
|
# (most likely being merged?)
|
|
self.env.cr.execute('''
|
|
SELECT id, state FROM runbot_merge_pull_requests
|
|
WHERE id = %s AND state != 'merged'
|
|
FOR UPDATE SKIP LOCKED;
|
|
''', [self.id])
|
|
if not self.env.cr.fetchone():
|
|
return False
|
|
|
|
self.env.cr.execute('''
|
|
UPDATE runbot_merge_pull_requests
|
|
SET state = 'closed'
|
|
WHERE id = %s
|
|
''', [self.id])
|
|
self.env.cr.commit()
|
|
self.modified(['state'])
|
|
self.unstage("closed by %s", by)
|
|
return True
|
|
|
|
# state changes on reviews
|
|
RPLUS = {
|
|
'opened': 'approved',
|
|
'validated': 'ready',
|
|
}
|
|
RMINUS = {
|
|
'approved': 'opened',
|
|
'ready': 'validated',
|
|
'error': 'validated',
|
|
}
|
|
|
|
_TAGS = {
|
|
False: set(),
|
|
'opened': {'seen 🙂'},
|
|
}
|
|
_TAGS['validated'] = _TAGS['opened'] | {'CI 🤖'}
|
|
_TAGS['approved'] = _TAGS['opened'] | {'r+ 👌'}
|
|
_TAGS['ready'] = _TAGS['validated'] | _TAGS['approved']
|
|
_TAGS['staged'] = _TAGS['ready'] | {'merging 👷'}
|
|
_TAGS['merged'] = _TAGS['ready'] | {'merged 🎉'}
|
|
_TAGS['error'] = _TAGS['opened'] | {'error 🙅'}
|
|
_TAGS['closed'] = _TAGS['opened'] | {'closed 💔'}
|
|
ALL_TAGS = set.union(*_TAGS.values())
|
|
|
|
class Tagging(models.Model):
|
|
"""
|
|
Queue of tag changes to make on PRs.
|
|
|
|
Several PR state changes are driven by webhooks, webhooks should return
|
|
quickly, performing calls to the Github API would *probably* get in the
|
|
way of that. Instead, queue tagging changes into this table whose
|
|
execution can be cron-driven.
|
|
"""
|
|
_name = _description = 'runbot_merge.pull_requests.tagging'
|
|
|
|
repository = fields.Many2one('runbot_merge.repository', required=True)
|
|
# store the PR number (not id) as we need a Tagging for PR objects
|
|
# being deleted (retargeted to non-managed branches)
|
|
pull_request = fields.Integer(group_operator=None)
|
|
|
|
tags_remove = fields.Char(required=True, default='[]')
|
|
tags_add = fields.Char(required=True, default='[]')
|
|
|
|
def create(self, values):
|
|
if values.pop('state_from', None):
|
|
values['tags_remove'] = ALL_TAGS
|
|
if 'state_to' in values:
|
|
values['tags_add'] = _TAGS[values.pop('state_to')]
|
|
if not isinstance(values.get('tags_remove', ''), str):
|
|
values['tags_remove'] = json.dumps(list(values['tags_remove']))
|
|
if not isinstance(values.get('tags_add', ''), str):
|
|
values['tags_add'] = json.dumps(list(values['tags_add']))
|
|
return super().create(values)
|
|
|
|
def _send(self):
|
|
# noinspection SqlResolve
|
|
self.env.cr.execute("""
|
|
SELECT
|
|
t.repository as repo_id,
|
|
t.pull_request as pr_number,
|
|
array_agg(t.id) as ids,
|
|
array_agg(t.tags_remove::json) as to_remove,
|
|
array_agg(t.tags_add::json) as to_add
|
|
FROM runbot_merge_pull_requests_tagging t
|
|
GROUP BY t.repository, t.pull_request
|
|
""")
|
|
Repos = self.env['runbot_merge.repository']
|
|
ghs = {}
|
|
to_remove = []
|
|
for repo_id, pr, ids, remove, add in self.env.cr.fetchall():
|
|
repo = Repos.browse(repo_id)
|
|
|
|
gh = ghs.get(repo)
|
|
if not gh:
|
|
gh = ghs[repo] = repo.github()
|
|
|
|
# fold all grouped PRs'
|
|
tags_remove, tags_add = set(), set()
|
|
for minus, plus in zip(remove, add):
|
|
tags_remove.update(minus)
|
|
# need to remove minuses from to_add in case we get e.g.
|
|
# -foo +bar; -bar +baz, if we don't remove the minus, we'll end
|
|
# up with -foo +bar +baz instead of -foo +baz
|
|
tags_add.difference_update(minus)
|
|
tags_add.update(plus)
|
|
|
|
try:
|
|
gh.change_tags(pr, tags_remove, tags_add)
|
|
except Exception:
|
|
_logger.info(
|
|
"Error while trying to change the tags of %s#%s from %s to %s",
|
|
repo.name, pr, remove, add,
|
|
)
|
|
else:
|
|
to_remove.extend(ids)
|
|
self.browse(to_remove).unlink()
|
|
|
|
class Feedback(models.Model):
|
|
""" Queue of feedback comments to send to PR users
|
|
"""
|
|
_name = _description = 'runbot_merge.pull_requests.feedback'
|
|
|
|
repository = fields.Many2one('runbot_merge.repository', required=True)
|
|
# store the PR number (not id) as we may want to send feedback to PR
|
|
# objects on non-handled branches
|
|
pull_request = fields.Integer(group_operator=None)
|
|
message = fields.Char()
|
|
close = fields.Boolean()
|
|
token_field = fields.Selection(
|
|
[('github_token', "Mergebot")],
|
|
default='github_token',
|
|
string="Bot User",
|
|
help="Token field (from repo's project) to use to post messages"
|
|
)
|
|
|
|
def _send(self):
|
|
ghs = {}
|
|
to_remove = []
|
|
for f in self.search([]):
|
|
repo = f.repository
|
|
gh = ghs.get((repo, f.token_field))
|
|
if not gh:
|
|
gh = ghs[(repo, f.token_field)] = repo.github(f.token_field)
|
|
|
|
try:
|
|
message = f.message
|
|
with contextlib.suppress(json.JSONDecodeError):
|
|
data = json.loads(message or '')
|
|
message = data.get('message')
|
|
|
|
if data.get('base'):
|
|
gh('PATCH', f'pulls/{f.pull_request}', json={'base': data['base']})
|
|
|
|
if f.close:
|
|
pr_to_notify = self.env['runbot_merge.pull_requests'].search([
|
|
('repository', '=', repo.id),
|
|
('number', '=', f.pull_request),
|
|
])
|
|
if pr_to_notify:
|
|
pr_to_notify._notify_merged(gh, data)
|
|
|
|
if f.close:
|
|
gh.close(f.pull_request)
|
|
|
|
if message:
|
|
gh.comment(f.pull_request, message)
|
|
except Exception:
|
|
_logger.exception(
|
|
"Error while trying to %s %s#%s (%s)",
|
|
'close' if f.close else 'send a comment to',
|
|
repo.name, f.pull_request,
|
|
utils.shorten(f.message, 200)
|
|
)
|
|
else:
|
|
to_remove.append(f.id)
|
|
self.browse(to_remove).unlink()
|
|
|
|
class FeedbackTemplate(models.Model):
|
|
_name = 'runbot_merge.pull_requests.feedback.template'
|
|
_description = "str.format templates for feedback messages, no integration," \
|
|
"but that's their purpose"
|
|
_inherit = ['mail.thread']
|
|
|
|
template = fields.Text(tracking=True)
|
|
help = fields.Text(readonly=True)
|
|
|
|
def _format(self, **args):
|
|
return self.template.format_map(args)
|
|
|
|
def _send(self, *, repository: Repository, pull_request: int, format_args: dict, token_field: Optional[str] = None) -> Optional[Feedback]:
|
|
try:
|
|
feedback = {
|
|
'repository': repository.id,
|
|
'pull_request': pull_request,
|
|
'message': self.template.format_map(format_args),
|
|
}
|
|
if token_field:
|
|
feedback['token_field'] = token_field
|
|
return self.env['runbot_merge.pull_requests.feedback'].create(feedback)
|
|
except Exception:
|
|
_logger.exception("Failed to render template %s", self.get_external_id())
|
|
raise
|
|
|
|
|
|
class StagingCommits(models.Model):
|
|
_name = 'runbot_merge.stagings.commits'
|
|
_description = "Mergeable commits for stagings, always the actually merged " \
|
|
"commit, never a uniquifier"
|
|
_log_access = False
|
|
|
|
staging_id = fields.Many2one('runbot_merge.stagings', required=True)
|
|
commit_id = fields.Many2one('runbot_merge.commit', index=True, required=True)
|
|
repository_id = fields.Many2one('runbot_merge.repository', required=True)
|
|
|
|
def _auto_init(self):
|
|
super()._auto_init()
|
|
# the same commit can be both head and tip (?)
|
|
tools.create_unique_index(
|
|
self.env.cr, self._table + "_unique",
|
|
self._table, ['staging_id', 'commit_id']
|
|
)
|
|
# there should be one head per staging per repository, unless one is a
|
|
# real head and one is a uniquifier head
|
|
tools.create_unique_index(
|
|
self.env.cr, self._table + "_unique_per_repo",
|
|
self._table, ['staging_id', 'repository_id'],
|
|
)
|
|
|
|
|
|
class StagingHeads(models.Model):
|
|
_name = 'runbot_merge.stagings.heads'
|
|
_description = "Staging heads, may be the staging's commit or may be a " \
|
|
"uniquifier (discarded on success)"
|
|
_log_access = False
|
|
|
|
staging_id = fields.Many2one('runbot_merge.stagings', required=True)
|
|
commit_id = fields.Many2one('runbot_merge.commit', index=True, required=True)
|
|
repository_id = fields.Many2one('runbot_merge.repository', required=True)
|
|
|
|
def _auto_init(self):
|
|
super()._auto_init()
|
|
# the same commit can be both head and tip (?)
|
|
tools.create_unique_index(
|
|
self.env.cr, self._table + "_unique",
|
|
self._table, ['staging_id', 'commit_id']
|
|
)
|
|
# there should be one head per staging per repository, unless one is a
|
|
# real head and one is a uniquifier head
|
|
tools.create_unique_index(
|
|
self.env.cr, self._table + "_unique_per_repo",
|
|
self._table, ['staging_id', 'repository_id'],
|
|
)
|
|
|
|
|
|
class Commit(models.Model):
|
|
"""Represents a commit onto which statuses might be posted,
|
|
independent of everything else as commits can be created by
|
|
statuses only, by PR pushes, by branch updates, ...
|
|
"""
|
|
_name = _description = 'runbot_merge.commit'
|
|
_rec_name = 'sha'
|
|
|
|
sha = fields.Char(required=True)
|
|
statuses = fields.Char(help="json-encoded mapping of status contexts to states", default="{}")
|
|
to_check = fields.Boolean(default=False)
|
|
|
|
head_ids = fields.Many2many('runbot_merge.stagings', relation='runbot_merge_stagings_heads', column2='staging_id', column1='commit_id')
|
|
commit_ids = fields.Many2many('runbot_merge.stagings', relation='runbot_merge_stagings_commits', column2='staging_id', column1='commit_id')
|
|
pull_requests = fields.One2many('runbot_merge.pull_requests', compute='_compute_prs')
|
|
|
|
def create(self, values):
|
|
values['to_check'] = True
|
|
r = super(Commit, self).create(values)
|
|
return r
|
|
|
|
def write(self, values):
|
|
values.setdefault('to_check', True)
|
|
r = super(Commit, self).write(values)
|
|
return r
|
|
|
|
def _notify(self):
|
|
Stagings = self.env['runbot_merge.stagings']
|
|
PRs = self.env['runbot_merge.pull_requests']
|
|
# chances are low that we'll have more than one commit
|
|
for c in self.search([('to_check', '=', True)]):
|
|
try:
|
|
c.to_check = False
|
|
st = json.loads(c.statuses)
|
|
pr = PRs.search([('head', '=', c.sha)])
|
|
if pr:
|
|
pr._validate(st)
|
|
|
|
stagings = Stagings.search([('head_ids.sha', '=', c.sha)])
|
|
if stagings:
|
|
stagings._validate()
|
|
except Exception:
|
|
_logger.exception("Failed to apply commit %s (%s)", c, c.sha)
|
|
self.env.cr.rollback()
|
|
else:
|
|
self.env.cr.commit()
|
|
|
|
_sql_constraints = [
|
|
('unique_sha', 'unique (sha)', 'no duplicated commit'),
|
|
]
|
|
|
|
def _auto_init(self):
|
|
res = super(Commit, self)._auto_init()
|
|
self._cr.execute("""
|
|
CREATE INDEX IF NOT EXISTS runbot_merge_unique_statuses
|
|
ON runbot_merge_commit
|
|
USING hash (sha)
|
|
""")
|
|
self._cr.execute("""
|
|
CREATE INDEX IF NOT EXISTS runbot_merge_to_process
|
|
ON runbot_merge_commit ((1)) WHERE to_check
|
|
""")
|
|
return res
|
|
|
|
def _compute_prs(self):
|
|
for c in self:
|
|
c.pull_requests = self.env['runbot_merge.pull_requests'].search([
|
|
('head', '=', self.sha),
|
|
])
|
|
|
|
|
|
class Stagings(models.Model):
|
|
_name = _description = 'runbot_merge.stagings'
|
|
|
|
target = fields.Many2one('runbot_merge.branch', required=True, index=True)
|
|
|
|
batch_ids = fields.One2many(
|
|
'runbot_merge.batch', 'staging_id',
|
|
context={'active_test': False},
|
|
)
|
|
pr_ids = fields.One2many('runbot_merge.pull_requests', compute='_compute_prs')
|
|
state = fields.Selection([
|
|
('success', 'Success'),
|
|
('failure', 'Failure'),
|
|
('pending', 'Pending'),
|
|
('cancelled', "Cancelled"),
|
|
('ff_failed', "Fast forward failed")
|
|
], default='pending', index=True)
|
|
active = fields.Boolean(default=True)
|
|
|
|
staged_at = fields.Datetime(default=fields.Datetime.now, index=True)
|
|
timeout_limit = fields.Datetime(store=True, compute='_compute_timeout_limit')
|
|
reason = fields.Text("Reason for final state (if any)")
|
|
|
|
head_ids = fields.Many2many('runbot_merge.commit', relation='runbot_merge_stagings_heads', column1='staging_id', column2='commit_id')
|
|
heads = fields.One2many('runbot_merge.stagings.heads', 'staging_id')
|
|
commit_ids = fields.Many2many('runbot_merge.commit', relation='runbot_merge_stagings_commits', column1='staging_id', column2='commit_id')
|
|
commits = fields.One2many('runbot_merge.stagings.commits', 'staging_id')
|
|
|
|
statuses = fields.Binary(compute='_compute_statuses')
|
|
statuses_cache = fields.Text()
|
|
|
|
def write(self, vals):
|
|
# don't allow updating the statuses_cache
|
|
vals.pop('statuses_cache', None)
|
|
|
|
if 'state' not in vals:
|
|
return super().write(vals)
|
|
|
|
previously_pending = self.filtered(lambda s: s.state == 'pending')
|
|
super().write(vals)
|
|
for staging in previously_pending:
|
|
if staging.state != 'pending':
|
|
super(Stagings, staging).write({
|
|
'statuses_cache': json.dumps(staging.statuses)
|
|
})
|
|
|
|
return True
|
|
|
|
def name_get(self):
|
|
return [
|
|
(staging.id, "%d (%s, %s%s)" % (
|
|
staging.id,
|
|
staging.target.name,
|
|
staging.state,
|
|
(', ' + staging.reason) if staging.reason else '',
|
|
))
|
|
for staging in self
|
|
]
|
|
|
|
@api.depends('heads')
|
|
def _compute_statuses(self):
|
|
""" Fetches statuses associated with the various heads, returned as
|
|
(repo, context, state, url)
|
|
"""
|
|
heads = {h.commit_id: h.repository_id for h in self.mapped('heads')}
|
|
all_heads = self.mapped('head_ids')
|
|
|
|
for st in self:
|
|
if st.statuses_cache:
|
|
st.statuses = json.loads(st.statuses_cache)
|
|
continue
|
|
|
|
commits = st.head_ids.with_prefetch(all_heads._prefetch_ids)
|
|
st.statuses = [
|
|
(
|
|
heads[commit].name,
|
|
context,
|
|
status.get('state') or 'pending',
|
|
status.get('target_url') or ''
|
|
)
|
|
for commit in commits
|
|
for context, status in json.loads(commit.statuses).items()
|
|
]
|
|
|
|
# only depend on staged_at as it should not get modified, but we might
|
|
# update the CI timeout after the staging have been created and we
|
|
# *do not* want to update the staging timeouts in that case
|
|
@api.depends('staged_at')
|
|
def _compute_timeout_limit(self):
|
|
for st in self:
|
|
st.timeout_limit = fields.Datetime.to_string(
|
|
fields.Datetime.from_string(st.staged_at)
|
|
+ datetime.timedelta(minutes=st.target.project_id.ci_timeout)
|
|
)
|
|
|
|
@api.depends('batch_ids.prs')
|
|
def _compute_prs(self):
|
|
for staging in self:
|
|
staging.pr_ids = staging.batch_ids.prs
|
|
|
|
def _validate(self):
|
|
for s in self:
|
|
if s.state != 'pending':
|
|
continue
|
|
|
|
# maps commits to the statuses they need
|
|
required_statuses = [
|
|
(h.commit_id.sha, h.repository_id.status_ids._for_staging(s).mapped('context'))
|
|
for h in s.heads
|
|
]
|
|
# maps commits to their statuses
|
|
cmap = {c.sha: json.loads(c.statuses) for c in s.head_ids}
|
|
|
|
update_timeout_limit = False
|
|
st = 'success'
|
|
for head, reqs in required_statuses:
|
|
statuses = cmap.get(head) or {}
|
|
for v in map(lambda n: statuses.get(n, {}).get('state'), reqs):
|
|
if st == 'failure' or v in ('error', 'failure'):
|
|
st = 'failure'
|
|
elif v is None:
|
|
st = 'pending'
|
|
elif v == 'pending':
|
|
st = 'pending'
|
|
update_timeout_limit = True
|
|
else:
|
|
assert v == 'success'
|
|
|
|
vals = {'state': st}
|
|
if update_timeout_limit:
|
|
vals['timeout_limit'] = fields.Datetime.to_string(datetime.datetime.now() + datetime.timedelta(minutes=s.target.project_id.ci_timeout))
|
|
_logger.debug("%s got pending status, bumping timeout to %s (%s)", self, vals['timeout_limit'], cmap)
|
|
s.write(vals)
|
|
|
|
def action_cancel(self):
|
|
w = self.env['runbot_merge.stagings.cancel'].create({
|
|
'staging_id': self.id,
|
|
})
|
|
return {
|
|
'type': 'ir.actions.act_window',
|
|
'target': 'new',
|
|
'name': f'Cancel staging {self.id} ({self.target.name})',
|
|
'view_mode': 'form',
|
|
'res_model': w._name,
|
|
'res_id': w.id,
|
|
}
|
|
|
|
def cancel(self, reason, *args):
|
|
self = self.filtered('active')
|
|
if not self:
|
|
return
|
|
|
|
_logger.info("Cancelling staging %s: " + reason, self, *args)
|
|
self.mapped('batch_ids').write({'active': False})
|
|
self.write({
|
|
'active': False,
|
|
'state': 'cancelled',
|
|
'reason': reason % args,
|
|
})
|
|
|
|
def fail(self, message, prs=None):
|
|
_logger.info("Staging %s failed: %s", self, message)
|
|
prs = prs or self.batch_ids.prs
|
|
prs.write({'state': 'error'})
|
|
for pr in prs:
|
|
self.env.ref('runbot_merge.pr.staging.fail')._send(
|
|
repository=pr.repository,
|
|
pull_request=pr.number,
|
|
format_args={'pr': pr, 'message': message},
|
|
)
|
|
|
|
self.batch_ids.write({'active': False})
|
|
self.write({
|
|
'active': False,
|
|
'state': 'failure',
|
|
'reason': message,
|
|
})
|
|
|
|
def try_splitting(self):
|
|
batches = len(self.batch_ids)
|
|
if batches > 1:
|
|
midpoint = batches // 2
|
|
h, t = self.batch_ids[:midpoint], self.batch_ids[midpoint:]
|
|
# NB: batches remain attached to their original staging
|
|
sh = self.env['runbot_merge.split'].create({
|
|
'target': self.target.id,
|
|
'batch_ids': [(4, batch.id, 0) for batch in h],
|
|
})
|
|
st = self.env['runbot_merge.split'].create({
|
|
'target': self.target.id,
|
|
'batch_ids': [(4, batch.id, 0) for batch in t],
|
|
})
|
|
_logger.info("Split %s to %s (%s) and %s (%s)",
|
|
self, h, sh, t, st)
|
|
self.batch_ids.write({'active': False})
|
|
self.write({
|
|
'active': False,
|
|
'state': 'failure',
|
|
'reason': self.reason if self.state == 'failure' else 'timed out'
|
|
})
|
|
return True
|
|
|
|
# single batch => the staging is an unredeemable failure
|
|
if self.state != 'failure':
|
|
# timed out, just mark all PRs (wheee)
|
|
self.fail('timed out (>{} minutes)'.format(self.target.project_id.ci_timeout))
|
|
return False
|
|
|
|
# try inferring which PR failed and only mark that one
|
|
for head in self.heads:
|
|
required_statuses = set(head.repository_id.status_ids._for_staging(self).mapped('context'))
|
|
|
|
statuses = json.loads(head.commit_id.statuses or '{}')
|
|
reason = next((
|
|
ctx for ctx, result in statuses.items()
|
|
if ctx in required_statuses
|
|
if result.get('state') in ('error', 'failure')
|
|
), None)
|
|
if not reason:
|
|
continue
|
|
|
|
pr = next((pr for pr in self.batch_ids.prs if pr.repository == head.repository_id), None)
|
|
|
|
status = statuses[reason]
|
|
viewmore = ''
|
|
if status.get('target_url'):
|
|
viewmore = ' (view more at %(target_url)s)' % status
|
|
if pr:
|
|
self.fail("%s%s" % (reason, viewmore), pr)
|
|
else:
|
|
self.fail('%s on %s%s' % (reason, head.commit_id.sha, viewmore))
|
|
return False
|
|
|
|
# the staging failed but we don't have a specific culprit, fail
|
|
# everything
|
|
self.fail("unknown reason")
|
|
|
|
return False
|
|
|
|
def check_status(self):
|
|
"""
|
|
Checks the status of an active staging:
|
|
* merges it if successful
|
|
* splits it if failed (or timed out) and more than 1 batch
|
|
* marks the PRs as failed otherwise
|
|
* ignores if pending (or cancelled or ff_failed but those should also
|
|
be disabled)
|
|
"""
|
|
logger = _logger.getChild('cron')
|
|
if not self.active:
|
|
logger.info("Staging %s is not active, ignoring status check", self)
|
|
return
|
|
|
|
logger.info("Checking active staging %s (state=%s)", self, self.state)
|
|
project = self.target.project_id
|
|
if self.state == 'success':
|
|
gh = {repo.name: repo.github() for repo in project.repo_ids.having_branch(self.target)}
|
|
self.env.cr.execute('''
|
|
SELECT 1 FROM runbot_merge_pull_requests
|
|
WHERE id in %s
|
|
FOR UPDATE
|
|
''', [tuple(self.mapped('batch_ids.prs.id'))])
|
|
try:
|
|
with sentry_sdk.start_span(description="merge staging") as span:
|
|
span.set_tag("staging", self.id)
|
|
span.set_tag("branch", self.target.name)
|
|
self._safety_dance(gh, self.commits)
|
|
except exceptions.FastForwardError as e:
|
|
logger.warning(
|
|
"Could not fast-forward successful staging on %s:%s",
|
|
e.args[0], self.target.name,
|
|
exc_info=True
|
|
)
|
|
self.write({
|
|
'state': 'ff_failed',
|
|
'reason': str(e.__cause__ or e.__context__ or e)
|
|
})
|
|
else:
|
|
prs = self.mapped('batch_ids.prs')
|
|
logger.info(
|
|
"%s FF successful, marking %s as merged",
|
|
self, prs
|
|
)
|
|
prs.write({'state': 'merged'})
|
|
|
|
pseudobranch = None
|
|
if self.target == project.branch_ids[:1]:
|
|
pseudobranch = project._next_freeze()
|
|
|
|
for pr in prs:
|
|
self.env['runbot_merge.pull_requests.feedback'].create({
|
|
'repository': pr.repository.id,
|
|
'pull_request': pr.number,
|
|
'message': json.dumps({
|
|
'sha': json.loads(pr.commits_map)[''],
|
|
}),
|
|
'close': True,
|
|
})
|
|
if pseudobranch:
|
|
self.env['runbot_merge.pull_requests.tagging'].create({
|
|
'repository': pr.repository.id,
|
|
'pull_request': pr.number,
|
|
'tags_add': json.dumps([pseudobranch]),
|
|
})
|
|
finally:
|
|
self.batch_ids.write({'active': False})
|
|
self.write({'active': False})
|
|
elif self.state == 'failure' or self.is_timed_out():
|
|
self.try_splitting()
|
|
|
|
def is_timed_out(self):
|
|
return fields.Datetime.from_string(self.timeout_limit) < datetime.datetime.now()
|
|
|
|
def _safety_dance(self, gh, staging_commits: StagingCommits):
|
|
""" Reverting updates doesn't work if the branches are protected
|
|
(because a revert is basically a force push). So we can update
|
|
REPO_A, then fail to update REPO_B for some reason, and we're hosed.
|
|
|
|
To try and make this issue less likely, do the safety dance:
|
|
|
|
* First, perform a dry run using the tmp branches (which can be
|
|
force-pushed and sacrificed), that way if somebody pushed directly
|
|
to REPO_B during the staging we catch it. If we're really unlucky
|
|
they could still push after the dry run but...
|
|
* An other issue then is that the github call sometimes fails for no
|
|
noticeable reason (e.g. network failure or whatnot), if it fails
|
|
on REPO_B when REPO_A has already been updated things get pretty
|
|
bad. In that case, wait a bit and retry for now. A more complex
|
|
strategy (including disabling the branch entirely until somebody
|
|
has looked at and fixed the issue) might be necessary.
|
|
"""
|
|
tmp_target = 'tmp.' + self.target.name
|
|
# first force-push the current targets to all tmps
|
|
for repo_name in staging_commits.mapped('repository_id.name'):
|
|
g = gh[repo_name]
|
|
g.set_ref(tmp_target, g.head(self.target.name))
|
|
# then attempt to FF the tmp to the staging commits
|
|
for c in staging_commits:
|
|
gh[c.repository_id.name].fast_forward(tmp_target, c.commit_id.sha)
|
|
# there is still a race condition here, but it's way
|
|
# lower than "the entire staging duration"...
|
|
for i, c in enumerate(staging_commits):
|
|
for pause in [0.1, 0.3, 0.5, 0.9, 0]: # last one must be 0/falsy of we lose the exception
|
|
try:
|
|
gh[c.repository_id.name].fast_forward(
|
|
self.target.name,
|
|
c.commit_id.sha
|
|
)
|
|
except exceptions.FastForwardError:
|
|
if i and pause:
|
|
time.sleep(pause)
|
|
continue
|
|
raise
|
|
else:
|
|
break
|
|
|
|
@api.returns('runbot_merge.stagings')
|
|
def for_heads(self, *heads):
|
|
"""Returns the staging(s) with all the specified heads. Heads should
|
|
be unique git oids.
|
|
"""
|
|
if not heads:
|
|
return self.browse(())
|
|
|
|
joins = ''.join(
|
|
f'\nJOIN runbot_merge_stagings_heads h{i} ON h{i}.staging_id = s.id'
|
|
f'\nJOIN runbot_merge_commit c{i} ON c{i}.id = h{i}.commit_id AND c{i}.sha = %s\n'
|
|
for i in range(len(heads))
|
|
)
|
|
self.env.cr.execute(f"SELECT s.id FROM runbot_merge_stagings s {joins}", heads)
|
|
stagings = self.browse(id for [id] in self.env.cr.fetchall())
|
|
stagings.check_access_rights('read')
|
|
stagings.check_access_rule('read')
|
|
return stagings
|
|
|
|
@api.returns('runbot_merge.stagings')
|
|
def for_commits(self, *heads):
|
|
"""Returns the staging(s) with all the specified commits (heads which
|
|
have actually been merged). Commits should be unique git oids.
|
|
"""
|
|
if not heads:
|
|
return self.browse(())
|
|
|
|
joins = ''.join(
|
|
f'\nJOIN runbot_merge_stagings_commits h{i} ON h{i}.staging_id = s.id'
|
|
f'\nJOIN runbot_merge_commit c{i} ON c{i}.id = h{i}.commit_id AND c{i}.sha = %s\n'
|
|
for i in range(len(heads))
|
|
)
|
|
self.env.cr.execute(f"SELECT s.id FROM runbot_merge_stagings s {joins}", heads)
|
|
stagings = self.browse(id for [id] in self.env.cr.fetchall())
|
|
stagings.check_access_rights('read')
|
|
stagings.check_access_rule('read')
|
|
return stagings
|
|
|
|
class Split(models.Model):
|
|
_name = _description = 'runbot_merge.split'
|
|
|
|
target = fields.Many2one('runbot_merge.branch', required=True)
|
|
batch_ids = fields.One2many('runbot_merge.batch', 'split_id', context={'active_test': False})
|
|
|
|
class Batch(models.Model):
|
|
""" A batch is a "horizontal" grouping of *codependent* PRs: PRs with
|
|
the same label & target but for different repositories. These are
|
|
assumed to be part of the same "change" smeared over multiple
|
|
repositories e.g. change an API in repo1, this breaks use of that API
|
|
in repo2 which now needs to be updated.
|
|
"""
|
|
_name = _description = 'runbot_merge.batch'
|
|
|
|
target = fields.Many2one('runbot_merge.branch', required=True, index=True)
|
|
staging_id = fields.Many2one('runbot_merge.stagings', index=True)
|
|
split_id = fields.Many2one('runbot_merge.split', index=True)
|
|
|
|
prs = fields.Many2many('runbot_merge.pull_requests')
|
|
|
|
active = fields.Boolean(default=True)
|
|
|
|
@api.constrains('target', 'prs')
|
|
def _check_prs(self):
|
|
for batch in self:
|
|
repos = self.env['runbot_merge.repository']
|
|
for pr in batch.prs:
|
|
if pr.target != batch.target:
|
|
raise ValidationError("A batch and its PRs must have the same branch, got %s and %s" % (batch.target, pr.target))
|
|
if pr.repository in repos:
|
|
raise ValidationError("All prs of a batch must have different target repositories, got a duplicate %s on %s" % (pr.repository, pr))
|
|
repos |= pr.repository
|
|
|
|
|
|
class FetchJob(models.Model):
|
|
_name = _description = 'runbot_merge.fetch_job'
|
|
|
|
active = fields.Boolean(default=True)
|
|
repository = fields.Many2one('runbot_merge.repository', required=True)
|
|
number = fields.Integer(required=True, group_operator=None)
|
|
|
|
def _check(self, commit=False):
|
|
"""
|
|
:param bool commit: commit after each fetch has been executed
|
|
"""
|
|
while True:
|
|
f = self.search([], limit=1)
|
|
if not f:
|
|
return
|
|
|
|
self.env.cr.execute("SAVEPOINT runbot_merge_before_fetch")
|
|
try:
|
|
f.repository._load_pr(f.number)
|
|
except Exception:
|
|
self.env.cr.execute("ROLLBACK TO SAVEPOINT runbot_merge_before_fetch")
|
|
_logger.exception("Failed to load pr %s, skipping it", f.number)
|
|
finally:
|
|
self.env.cr.execute("RELEASE SAVEPOINT runbot_merge_before_fetch")
|
|
|
|
f.active = False
|
|
if commit:
|
|
self.env.cr.commit()
|
|
|
|
|
|
from .stagings_create import is_mentioned, Message
|