Title: [188478] trunk/Tools
- Revision
- 188478
- Author
- [email protected]
- Date
- 2015-08-14 11:06:51 -0700 (Fri, 14 Aug 2015)
Log Message
Refactor BuildbotQueueView._appendPendingRevisionCount to work more generically with repositories
other than "openSource" and "internal".
https://bugs.webkit.org/show_bug.cgi?id=147938
Patch by Jason Marcell <[email protected]> on 2015-08-14
Reviewed by Daniel Bates.
* BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:
(BuildbotQueueView.prototype._appendPendingRevisionCount): Refactored to work more generically with
repositories other than "openSource" and "internal".
Modified Paths
Diff
Modified: trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js (188477 => 188478)
--- trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js 2015-08-14 17:43:42 UTC (rev 188477)
+++ trunk/Tools/BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js 2015-08-14 18:06:51 UTC (rev 188478)
@@ -76,26 +76,24 @@
if (!latestProductiveIteration)
return;
- var webkitTrac = Dashboard.Repository.OpenSource.trac;
- var internalTrac = Dashboard.Repository.Internal.trac;
- var latestRecordedOpenSourceRevisionNumber = webkitTrac.latestRecordedRevisionNumber;
- if (!latestRecordedOpenSourceRevisionNumber || webkitTrac.oldestRecordedRevisionNumber > latestProductiveIteration.revision[Dashboard.Repository.OpenSource.name]) {
- webkitTrac.loadMoreHistoricalData();
- return;
- }
+ var totalRevisionsBehind = 0;
// FIXME: To be 100% correct, we should also filter out changes that are ignored by
// the queue, see _should_file_trigger_build in wkbuild.py.
- var totalRevisionsBehind = webkitTrac.commitsOnBranch(queue.branch.openSource, function(commit) { return commit.revisionNumber > latestProductiveIteration.revision[Dashboard.Repository.OpenSource.name]; }).length;
-
- if (latestProductiveIteration.revision[Dashboard.Repository.Internal.name]) {
- var latestRecordedInternalRevisionNumber = internalTrac.latestRecordedRevisionNumber;
- if (!latestRecordedInternalRevisionNumber || internalTrac.oldestRecordedRevisionNumber > latestProductiveIteration.revision[Dashboard.Repository.Internal.name]) {
- internalTrac.loadMoreHistoricalData();
+ var sortedRepositories = Dashboard.sortedRepositories;
+ for (var i = 0; i < sortedRepositories.length; i++) {
+ var repository = sortedRepositories[i];
+ var trac = repository.trac;
+ var repositoryName = repository.name;
+ var latestProductiveRevisionNumber = latestProductiveIteration.revision[repositoryName];
+ if (!latestProductiveRevisionNumber)
+ continue;
+ if (!trac.latestRecordedRevisionNumber || trac.oldestRecordedRevisionNumber > latestProductiveRevisionNumber) {
+ trac.loadMoreHistoricalData();
return;
}
- totalRevisionsBehind += internalTrac.commitsOnBranch(queue.branch.internal, function(commit) { return commit.revisionNumber > latestProductiveIteration.revision[Dashboard.Repository.Internal.name]; }).length;
+ totalRevisionsBehind += trac.commitsOnBranch(queue.branch[repositoryName], function(commit) { return commit.revisionNumber > latestProductiveRevisionNumber; }).length;
}
if (!totalRevisionsBehind)
Modified: trunk/Tools/ChangeLog (188477 => 188478)
--- trunk/Tools/ChangeLog 2015-08-14 17:43:42 UTC (rev 188477)
+++ trunk/Tools/ChangeLog 2015-08-14 18:06:51 UTC (rev 188478)
@@ -1,3 +1,15 @@
+2015-08-14 Jason Marcell <[email protected]>
+
+ Refactor BuildbotQueueView._appendPendingRevisionCount to work more generically with repositories
+ other than "openSource" and "internal".
+ https://bugs.webkit.org/show_bug.cgi?id=147938
+
+ Reviewed by Daniel Bates.
+
+ * BuildSlaveSupport/build.webkit.org-config/public_html/dashboard/Scripts/BuildbotQueueView.js:
+ (BuildbotQueueView.prototype._appendPendingRevisionCount): Refactored to work more generically with
+ repositories other than "openSource" and "internal".
+
2015-08-14 Filip Pizlo <[email protected]>
Unreviewed, shorten another test that is timing out.
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
