zuul
/
zuul
Code Issues Proposed changes

Annotate all canMerge calls with event id 

The canMerge method is called without the event id from a few places.

Change-Id: I3233bd840dd0cc10817077c081c52852352df2ff
This commit is contained in:
Tobias Henkel 2020-07-30 15:56:33 +02:00
parent e4a207e5c9
commit 591ce11e8c
No known key found for this signature in database
GPG Key ID: 03750DEC158E5FA2
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
zuul/manager/dependent.py
View File

@ -92,7 +92,8 @@ class DependentPipelineManager(SharedQueuePipelineManager):
change_queue))
continue
source = other_change.project.source
if source.canMerge(other_change, self.getSubmitAllowNeeds()):
if source.canMerge(other_change, self.getSubmitAllowNeeds(),
event=event):
log.debug(" Change %s needs %s and is ready to merge",
other_change, change)
to_enqueue.append(other_change)
@ -168,7 +169,8 @@ class DependentPipelineManager(SharedQueuePipelineManager):
log.debug(" Needed change is already ahead in the queue")
continue
if needed_change.project.source.canMerge(
needed_change, self.getSubmitAllowNeeds()):
needed_change, self.getSubmitAllowNeeds(),
event=event):
log.debug(" Change %s is needed", needed_change)
if needed_change not in changes_needed:
changes_needed.append(needed_change)