| Index: third_party/buildbot_8_4p1/README.chromium
|
| diff --git a/third_party/buildbot_8_4p1/README.chromium b/third_party/buildbot_8_4p1/README.chromium
|
| index 9beb04ba651d6231c752cf63d272b40faef8065c..7d5d14b1f349b104292f29d1690c32aadb63dac3 100644
|
| --- a/third_party/buildbot_8_4p1/README.chromium
|
| +++ b/third_party/buildbot_8_4p1/README.chromium
|
| @@ -5873,84 +5873,3 @@
|
| 'recent_successful_build_times': recent_successful_build_times,
|
| 'recent_finished_build_times': recent_finished_build_times,
|
| 'pending_builds': 0,
|
| -
|
| -commit 51ce3a66aadbbe847dd0501ad023f4598601f793
|
| -Author: Rico Wind <ricow@google.com>
|
| -Date: Fri Aug 21 13:08:28 2015 +0200
|
| -
|
| - Fix buildbot console view in order_by_time mode
|
| -
|
| - Applying a rebased version of http://trac.buildbot.net/ticket/2364
|
| -
|
| -diff --git a/third_party/buildbot_8_4p1/buildbot/status/web/console.py b/third_party/buildbot_8_4p1/buildbot/status/web/console.py
|
| -index 2d48aca..36def52 100644
|
| ---- a/third_party/buildbot_8_4p1/buildbot/status/web/console.py
|
| -+++ b/third_party/buildbot_8_4p1/buildbot/status/web/console.py
|
| -@@ -158,7 +158,8 @@ class DevRevision:
|
| - class DevBuild:
|
| - """Helper class that contains all the information we need for a build."""
|
| -
|
| -- def __init__(self, revision, build, details, inProgressResults=None):
|
| -+ def __init__(self, revision, build, details, inProgressResults=None,
|
| -+ revisions=[]):
|
| - self.revision = revision
|
| - self.results = build.getResults()
|
| - self.number = build.getNumber()
|
| -@@ -169,6 +170,10 @@ class DevBuild:
|
| - self.when = build.getTimes()[0]
|
| - self.source = build.getSourceStamp()
|
| - self.inProgressResults = inProgressResults
|
| -+ for rev in revisions:
|
| -+ if rev.revision == revision:
|
| -+ self.when = rev.when
|
| -+ break
|
| -
|
| -
|
| - class ConsoleStatusResource(HtmlResource):
|
| -@@ -316,7 +321,7 @@ class ConsoleStatusResource(HtmlResource):
|
| - return details
|
| -
|
| - def getBuildsForRevision(self, request, builder, builderName, lastRevision,
|
| -- numBuilds, debugInfo):
|
| -+ numBuilds, debugInfo, revisions):
|
| - """Return the list of all the builds for a given builder that we will
|
| - need to be able to display the console page. We start by the most recent
|
| - build, and we go down until we find a build that was built prior to the
|
| -@@ -357,7 +362,7 @@ class ConsoleStatusResource(HtmlResource):
|
| - if got_rev and got_rev != -1:
|
| - details = self.getBuildDetails(request, builderName, build)
|
| - devBuild = DevBuild(got_rev, build, details,
|
| -- getInProgressResults(build))
|
| -+ getInProgressResults(build), revisions)
|
| - builds.append(devBuild)
|
| -
|
| - # Now break if we have enough builds.
|
| -@@ -385,7 +390,7 @@ class ConsoleStatusResource(HtmlResource):
|
| - return changes[-1]
|
| -
|
| - def getAllBuildsForRevision(self, status, request, lastRevision, numBuilds,
|
| -- categories, builders, debugInfo):
|
| -+ categories, builders, debugInfo, revisions):
|
| - """Returns a dictionary of builds we need to inspect to be able to
|
| - display the console page. The key is the builder name, and the value is
|
| - an array of build we care about. We also returns a dictionary of
|
| -@@ -436,7 +441,8 @@ class ConsoleStatusResource(HtmlResource):
|
| - builderName,
|
| - lastRevision,
|
| - numBuilds,
|
| -- debugInfo)
|
| -+ debugInfo,
|
| -+ revisions)
|
| -
|
| - return (builderList, allBuilds)
|
| -
|
| -@@ -800,7 +806,8 @@ class ConsoleStatusResource(HtmlResource):
|
| - numBuilds,
|
| - categories,
|
| - builders,
|
| -- debugInfo)
|
| -+ debugInfo,
|
| -+ revisions)
|
| -
|
| - debugInfo["added_blocks"] = 0
|
| - debugInfo["from_cache"] = 0
|
|
|