| OLD | NEW |
| 1 URL: http://buildbot.net/trac | 1 URL: http://buildbot.net/trac |
| 2 Version: 0.8.4p1 | 2 Version: 0.8.4p1 |
| 3 License: GNU General Public License (GPL) Version 2 | 3 License: GNU General Public License (GPL) Version 2 |
| 4 | 4 |
| 5 This is a forked copy of buildbot v0.8.4p1. | 5 This is a forked copy of buildbot v0.8.4p1. |
| 6 | 6 |
| 7 Make hidden steps stay hidden even if not finished, add brDoStepIf | 7 Make hidden steps stay hidden even if not finished, add brDoStepIf |
| 8 to support buildrunner. | 8 to support buildrunner. |
| 9 | 9 |
| 10 | 10 |
| (...skipping 5855 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5866 'current_builds': len(builder.getCurrentBuilds()), | 5866 'current_builds': len(builder.getCurrentBuilds()), |
| 5867 - 'recent_builds': len(recent_builds), | 5867 - 'recent_builds': len(recent_builds), |
| 5868 - 'recent_pending_builds': len(recent_pending_builds), | 5868 - 'recent_pending_builds': len(recent_pending_builds), |
| 5869 - 'recent_successful_builds': len(recent_successful_builds), | 5869 - 'recent_successful_builds': len(recent_successful_builds), |
| 5870 - 'recent_infra_failed_builds': len(recent_infra_failed_builds), | 5870 - 'recent_infra_failed_builds': len(recent_infra_failed_builds), |
| 5871 - 'recent_failed_builds': len(recent_failed_builds), | 5871 - 'recent_failed_builds': len(recent_failed_builds), |
| 5872 + 'recent_builds_by_status': recent_builds_by_status, | 5872 + 'recent_builds_by_status': recent_builds_by_status, |
| 5873 'recent_successful_build_times': recent_successful_build_times, | 5873 'recent_successful_build_times': recent_successful_build_times, |
| 5874 'recent_finished_build_times': recent_finished_build_times, | 5874 'recent_finished_build_times': recent_finished_build_times, |
| 5875 'pending_builds': 0, | 5875 'pending_builds': 0, |
| 5876 | |
| 5877 commit 51ce3a66aadbbe847dd0501ad023f4598601f793 | |
| 5878 Author: Rico Wind <ricow@google.com> | |
| 5879 Date: Fri Aug 21 13:08:28 2015 +0200 | |
| 5880 | |
| 5881 Fix buildbot console view in order_by_time mode | |
| 5882 | |
| 5883 Applying a rebased version of http://trac.buildbot.net/ticket/2364 | |
| 5884 | |
| 5885 diff --git a/third_party/buildbot_8_4p1/buildbot/status/web/console.py b/third_p
arty/buildbot_8_4p1/buildbot/status/web/console.py | |
| 5886 index 2d48aca..36def52 100644 | |
| 5887 --- a/third_party/buildbot_8_4p1/buildbot/status/web/console.py | |
| 5888 +++ b/third_party/buildbot_8_4p1/buildbot/status/web/console.py | |
| 5889 @@ -158,7 +158,8 @@ class DevRevision: | |
| 5890 class DevBuild: | |
| 5891 """Helper class that contains all the information we need for a build.""" | |
| 5892 | |
| 5893 - def __init__(self, revision, build, details, inProgressResults=None): | |
| 5894 + def __init__(self, revision, build, details, inProgressResults=None, | |
| 5895 + revisions=[]): | |
| 5896 self.revision = revision | |
| 5897 self.results = build.getResults() | |
| 5898 self.number = build.getNumber() | |
| 5899 @@ -169,6 +170,10 @@ class DevBuild: | |
| 5900 self.when = build.getTimes()[0] | |
| 5901 self.source = build.getSourceStamp() | |
| 5902 self.inProgressResults = inProgressResults | |
| 5903 + for rev in revisions: | |
| 5904 + if rev.revision == revision: | |
| 5905 + self.when = rev.when | |
| 5906 + break | |
| 5907 | |
| 5908 | |
| 5909 class ConsoleStatusResource(HtmlResource): | |
| 5910 @@ -316,7 +321,7 @@ class ConsoleStatusResource(HtmlResource): | |
| 5911 return details | |
| 5912 | |
| 5913 def getBuildsForRevision(self, request, builder, builderName, lastRevision, | |
| 5914 - numBuilds, debugInfo): | |
| 5915 + numBuilds, debugInfo, revisions): | |
| 5916 """Return the list of all the builds for a given builder that we will | |
| 5917 need to be able to display the console page. We start by the most recen
t | |
| 5918 build, and we go down until we find a build that was built prior to the | |
| 5919 @@ -357,7 +362,7 @@ class ConsoleStatusResource(HtmlResource): | |
| 5920 if got_rev and got_rev != -1: | |
| 5921 details = self.getBuildDetails(request, builderName, build) | |
| 5922 devBuild = DevBuild(got_rev, build, details, | |
| 5923 - getInProgressResults(build)) | |
| 5924 + getInProgressResults(build), revisions) | |
| 5925 builds.append(devBuild) | |
| 5926 | |
| 5927 # Now break if we have enough builds. | |
| 5928 @@ -385,7 +390,7 @@ class ConsoleStatusResource(HtmlResource): | |
| 5929 return changes[-1] | |
| 5930 | |
| 5931 def getAllBuildsForRevision(self, status, request, lastRevision, numBuilds, | |
| 5932 - categories, builders, debugInfo): | |
| 5933 + categories, builders, debugInfo, revisions): | |
| 5934 """Returns a dictionary of builds we need to inspect to be able to | |
| 5935 display the console page. The key is the builder name, and the value is | |
| 5936 an array of build we care about. We also returns a dictionary of | |
| 5937 @@ -436,7 +441,8 @@ class ConsoleStatusResource(HtmlResource): | |
| 5938 builderName, | |
| 5939 lastRevision, | |
| 5940 numBuilds, | |
| 5941 - debugInfo) | |
| 5942 + debugInfo, | |
| 5943 + revisions) | |
| 5944 | |
| 5945 return (builderList, allBuilds) | |
| 5946 | |
| 5947 @@ -800,7 +806,8 @@ class ConsoleStatusResource(HtmlResource): | |
| 5948 numBuilds, | |
| 5949 categories, | |
| 5950 builders, | |
| 5951 - debugInfo) | |
| 5952 + debugInfo, | |
| 5953 + revisions) | |
| 5954 | |
| 5955 debugInfo["added_blocks"] = 0 | |
| 5956 debugInfo["from_cache"] = 0 | |
| OLD | NEW |