# -*- coding: utf-8 -*- import builtins import collections import logging import re import sys from collections.abc import Mapping from contextlib import ExitStack from datetime import datetime, timedelta import requests import sentry_sdk from babel.dates import format_timedelta from dateutil import relativedelta from odoo import api, fields, models from odoo.addons.runbot_merge import git from odoo.addons.runbot_merge.github import GH # how long a merged PR survives MERGE_AGE = relativedelta.relativedelta(weeks=2) FOOTER = '\nMore info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port\n' _logger = logging.getLogger(__name__) class Queue: __slots__ = () limit = 100 def _process_item(self): raise NotImplementedError def _process(self): skip = 0 from_clause, where_clause, params = self._search(self._search_domain(), order='create_date, id', limit=1).get_sql() for _ in range(self.limit): self.env.cr.execute(f""" SELECT id FROM {from_clause} WHERE {where_clause or "true"} ORDER BY create_date, id LIMIT 1 OFFSET %s FOR UPDATE SKIP LOCKED """, [*params, skip]) b = self.browse(self.env.cr.fetchone()) if not b: return try: with sentry_sdk.start_span(description=self._name): b._process_item() b.unlink() self.env.cr.commit() except Exception: _logger.exception("Error while processing %s, skipping", b) self.env.cr.rollback() if b._on_failure(): skip += 1 self.env.cr.commit() def _on_failure(self): return True def _search_domain(self): return [] class ForwardPortTasks(models.Model, Queue): _name = 'forwardport.batches' _inherit = ['mail.thread'] _description = 'batches which got merged and are candidates for forward-porting' limit = 10 batch_id = fields.Many2one('runbot_merge.batch', required=True, index=True) source = fields.Selection([ ('merge', 'Merge'), ('fp', 'Forward Port Followup'), ('insert', 'New branch port'), ('complete', 'Complete ported batches'), ], required=True) retry_after = fields.Datetime(required=True, default='1900-01-01 01:01:01') cannot_apply = fields.Boolean(compute='_compute_cannot_apply', store=True) retry_after_relative = fields.Char(compute="_compute_retry_after_relative") pr_id = fields.Many2one('runbot_merge.pull_requests') @api.model_create_multi def create(self, vals_list): self.env.ref('forwardport.port_forward')._trigger() return super().create(vals_list) def write(self, vals): if retry := vals.get('retry_after'): self.env.ref('forwardport.port_forward')\ ._trigger(fields.Datetime.to_datetime(retry)) return super().write(vals) def _search_domain(self): return super()._search_domain() + [ ('cannot_apply', '=', False), ('retry_after', '<=', fields.Datetime.to_string(fields.Datetime.now())), ] @api.depends('retry_after', 'cannot_apply') def _compute_retry_after_relative(self): now = fields.Datetime.now() for t in self: if t.cannot_apply: t.retry_after_relative = "N/A" elif t.retry_after <= now: t.retry_after_relative = "" else: t.retry_after_relative = format_timedelta(t.retry_after - now, locale=t.env.lang) @api.depends('retry_after') def _compute_cannot_apply(self): for t in self: t.cannot_apply = t.retry_after > (t.create_date + timedelta(days=1)) def _on_failure(self): super()._on_failure() _, e, _ = sys.exc_info() self._message_log(body=f"Error while processing forward-port batch: {e}") self.retry_after = fields.Datetime.now() + timedelta(hours=1) def _process_item(self): batch = self.batch_id sentry_sdk.set_tag('forward-porting', batch.prs.mapped('display_name')) if self.source == 'complete': self._complete_batches() return newbatch = batch._port_forward() if not newbatch: # reached end of seq (or batch is empty) # FIXME: or configuration is fucky so doesn't want to FP (maybe should error and retry?) _logger.info( "Processed %s from %s (%s) -> end of the sequence", batch, self.source, batch.prs.mapped('display_name'), ) return _logger.info( "Processed %s from %s (%s) -> %s (%s)", batch, self.source, ', '.join(batch.prs.mapped('display_name')), newbatch, ', '.join(newbatch.prs.mapped('display_name')), ) # insert new batch in ancestry sequence if self.source == 'insert': self._process_insert(batch, newbatch) def _process_insert(self, batch, newbatch): self.env['runbot_merge.batch'].search([ ('parent_id', '=', batch.id), ('id', '!=', newbatch.id), ]).parent_id = newbatch.id # insert new PRs in ancestry sequence unless conflict (= no parent) for pr in newbatch.prs: next_target = pr._find_next_target() if not next_target: continue # should have one since it was inserted before an other PR? descendant = pr.search([ ('target', '=', next_target.id), ('source_id', '=', pr.source_id.id), ]) # copy the reviewing of the "descendant" (even if detached) to this pr if reviewer := descendant.reviewed_by: pr.reviewed_by = reviewer # replace parent_id *if not detached* if descendant.parent_id: descendant.parent_id = pr.id def _complete_batches(self): source = pr = self.pr_id source_id = pr.source_id or pr if not pr: _logger.warning( "Unable to complete descendants of %s (%s): no new PR", self.batch_id, self.batch_id.prs.mapped('display_name'), ) return _logger.info( "Completing batches for descendants of %s (added %s)", self.batch_id.prs.mapped('display_name'), self.pr_id.display_name, ) gh = requests.Session() repository = pr.repository gh.headers['Authorization'] = f'token {repository.project_id.fp_github_token}' PullRequests = self.env['runbot_merge.pull_requests'] self.env.cr.execute('LOCK runbot_merge_pull_requests IN SHARE MODE') # TODO: extract complete list of targets from `_find_next_target` # so we can create all the forwardport branches, push them, and # only then create the PR objects # TODO: maybe do that after making forward-port WC-less, so all the # branches can be pushed atomically at once for descendant in self.batch_id.descendants(): target = pr._find_next_target() if target is None: _logger.info("Will not forward-port %s: no next target", pr.display_name) return if PullRequests.search_count([ ('source_id', '=', source_id.id), ('target', '=', target.id), ('state', 'not in', ('closed', 'merged')), ], limit=1): _logger.warning("Will not forward-port %s: already ported", pr.display_name) return if target != descendant.target: self.env['runbot_merge.pull_requests.feedback'].create({ 'repository': repository.id, 'pull_request': source.id, 'token_field': 'fp_github_token', 'message': """\ {pr.ping}unable to port this PR forwards due to inconsistency: goes from \ {pr.target.name} to {next_target.name} but {batch} ({batch_prs}) targets \ {batch.target.name}. """.format(pr=pr, next_target=target, batch=descendant, batch_prs=', '.join(descendant.mapped('prs.display_name'))) }) return ref = descendant.prs[:1].refname # NOTE: ports the new source everywhere instead of porting each # PR to the next step as it does not *stop* on conflict repo = git.get_local(source.repository) conflict, head = source._create_port_branch(repo, target, forward=True) repo.push(git.fw_url(pr.repository), f'{head}:refs/heads/{ref}') remote_target = repository.fp_remote_target owner, _ = remote_target.split('/', 1) message = source.message + f"\n\nForward-Port-Of: {pr.display_name}" title, body = re.match(r'(?P