NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-27 13:25:47 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

[IMP] runbot: allow to define a base_batch manually

Browse Source
This commit is contained in:
Xavier-Do 2023-08-02 08:21:55 +02:00 committed by Christophe Monniez
parent 287be96775
commit b99a1fefc0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
runbot/models/batch.py
View File

@ -230,7 +230,9 @@ class Batch(models.Model):
# 2. FIND missing commit in a compatible base bundle # 2. FIND missing commit in a compatible base bundle
if not bundle.is_base: if not bundle.is_base:
merge_base_commits = self.commit_link_ids.mapped('merge_base_commit_id') merge_base_commits = self.commit_link_ids.mapped('merge_base_commit_id')
if auto_rebase: if self.base_reference_batch_id:
self._log('Using a defined reference batch [%s](%s)', self.base_reference_batch_id.id, self.base_reference_batch_id._url())
elif auto_rebase or not bundle.branch_ids:
self.base_reference_batch_id = last_base_batch self.base_reference_batch_id = last_base_batch
else: else:
self.base_reference_batch_id = False self.base_reference_batch_id = False