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

[FIX] runbot: better search of closest_branch for saas branches

Browse Source
This commit is contained in:
Christophe Simonis 2015-07-13 17:20:01 +02:00
parent df1d0f81b3
commit 6486cf49be
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
runbot/runbot.py
View File

@ -557,7 +557,7 @@ class runbot_build(osv.osv):
Rules priority for choosing the branch from the other repo is: Rules priority for choosing the branch from the other repo is:
1. Same branch name 1. Same branch name
2. Common ancestors (git merge-base) 2. Common ancestors (git merge-base)
3. Name splitting on '-' character 3. Match a branch which is the dashed-prefix of current branch name
Note that PR numbers are replaced by the branch name from which the PR is made, Note that PR numbers are replaced by the branch name from which the PR is made,
to prevent the above rules to mistakenly link PR of different repos together. to prevent the above rules to mistakenly link PR of different repos together.
""" """
@ -596,8 +596,11 @@ class runbot_build(osv.osv):
if common_refs: if common_refs:
name = sorted(common_refs.iteritems(), key=operator.itemgetter(1), reverse=True)[0][0] name = sorted(common_refs.iteritems(), key=operator.itemgetter(1), reverse=True)[0][0]
else: else:
# If all else as failed, fallback on '-' splitting # find a branch which is a prefix of the current branch name
name = build.branch_id.name.split('-', 1)[0] sorted_target_branches = sorted(possible_target_branches, key=len, reverse=True)
prefixes = [b for b in sorted_target_branches if name.startswith(b + '-')]
if prefixes:
return prefixes[0]
return name return name
def path(self, cr, uid, ids, *l, **kw): def path(self, cr, uid, ids, *l, **kw):