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: favor sticky branches during matching

Browse Source
This commit is contained in:
Christophe Simonis 2016-02-23 11:48:18 +01:00
parent d9c9642675
commit f7b2a40f43
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
runbot/runbot.py
View File

@ -652,8 +652,12 @@ class runbot_build(osv.osv):
target_repo_ids.append(r.id) target_repo_ids.append(r.id)
r = r.duplicate_id r = r.duplicate_id
sort_by_repo = lambda d: (target_repo_ids.index(d['repo_id'][0]), -1 * len(d.get('branch_name', '')), -1 * d['id']) sort_by_repo = lambda d: (not d['sticky'], # sticky first
target_repo_ids.index(d['repo_id'][0]),
-1 * len(d.get('branch_name', '')),
-1 * d['id'])
result_for = lambda d: (d['repo_id'][0], d['name'], 'exact') result_for = lambda d: (d['repo_id'][0], d['name'], 'exact')
fields = ['name', 'repo_id', 'sticky']
# 1. same name, not a PR # 1. same name, not a PR
domain = [ domain = [
@ -661,7 +665,7 @@ class runbot_build(osv.osv):
('branch_name', '=', name), ('branch_name', '=', name),
('name', '=like', 'refs/heads/%'), ('name', '=like', 'refs/heads/%'),
] ]
targets = branch_pool.search_read(cr, uid, domain, ['name', 'repo_id'], order='id DESC', targets = branch_pool.search_read(cr, uid, domain, fields, order='id DESC',
context=context) context=context)
targets = sorted(targets, key=sort_by_repo) targets = sorted(targets, key=sort_by_repo)
if targets: if targets:
@ -673,7 +677,7 @@ class runbot_build(osv.osv):
('pull_head_name', '=', name), ('pull_head_name', '=', name),
('name', '=like', 'refs/pull/%'), ('name', '=like', 'refs/pull/%'),
] ]
pulls = branch_pool.search_read(cr, uid, domain, ['name', 'repo_id'], order='id DESC', pulls = branch_pool.search_read(cr, uid, domain, fields, order='id DESC',
context=context) context=context)
pulls = sorted(pulls, key=sort_by_repo) pulls = sorted(pulls, key=sort_by_repo)
for pull in pulls: for pull in pulls:
@ -685,7 +689,7 @@ class runbot_build(osv.osv):
branches = branch_pool.search_read( branches = branch_pool.search_read(
cr, uid, cr, uid,
[('repo_id', 'in', target_repo_ids), ('name', '=like', 'refs/heads/%')], [('repo_id', 'in', target_repo_ids), ('name', '=like', 'refs/heads/%')],
['name', 'branch_name', 'repo_id'], order='id DESC', context=context fields + ['branch_name'], order='id DESC', context=context
) )
branches = sorted(branches, key=sort_by_repo) branches = sorted(branches, key=sort_by_repo)