mirror of
https://github.com/odoo/runbot.git
synced 2025-03-15 23:45:44 +07:00
94fe0329b4
Test and refine the handling of batch forward ports around branch deactivation, especially with differential. Notably, fix an error in the conversion of the FW process to batches: individual PR limit was not correctly taken in account during forward port unless *all* PRs were done, even though that is a primary motivation for the change. Partial forward porting should now work correctly, and the detection and handling of differential next target should be better handled to boot. Significantly rework the interplay between batches and PRs being closed in order to maintain sequencing / consistency of forward port sequences: previously a batch would get deleted if all its PRs are closed, but that is an issue when it is part of a forward port sequence as we now lose information. Instead, detach the PRs from the batch as before but have the batch skip unlinking if it has historical value (parent or child batch). Currently the batch's state is a bit weird as it doesn't get merged, but... While at it, significantly simplify `_try_closing` as it turns out to have a ton of incidental / historical complexity from old attempts at fixing concurrency issues, which should not be necessary anymore and in fact actively interfere with the new and more compute-heavy state of things. |
||
|---|---|---|
| .. | ||
| __init__.py | ||
| forwardport.py | ||
| project_freeze.py | ||
| project.py | ||