Merge branch 'consolecodebase' of git://github.com/pepsiman/buildbot …

…into buildbot-0.8.7

master/buildbot/status/web/console.py

@@ -220,8 +220,8 @@ def getBuildDetails(self, request, builderName, build):
                         logs.append(dict(url=logurl, name=logname))
         return details
 
-    def getBuildsForRevision(self, request, builder, builderName, lastRevision,
-                             numBuilds, debugInfo):
+    def getBuildsForRevision(self, request, builder, builderName, codebase,
+                             lastRevision, numBuilds, debugInfo):
         """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
@@ -235,32 +235,37 @@ def getBuildsForRevision(self, request, builder, builderName, lastRevision,
         while build and number < numBuilds:
             debugInfo["builds_scanned"] += 1
 
+            got_rev = None
+            sourceStamps = build.getSourceStamps(absolute=True)
+
             # The console page cannot handle builds that have more than 1 revision
-            if len(build.getSourceStamps()) == 1:
-                number += 1
+            if codebase is not None:
+                # Get the last revision in this build for this codebase.
+                for ss in sourceStamps:
+                    if ss.codebase == codebase:
+                        got_rev = ss.revision
+                        break
+            elif len(sourceStamps) == 1:
+                ss = sourceStamps[0]
                 # Get the last revision in this build.
-                # We first try "got_revision", but if it does not work, then
-                # we try "revision".
-                got_rev = build.getProperty("got_revision", build.getProperty("revision", -1))
-                if got_rev != -1 and not self.comparator.isValidRevision(got_rev):
-                    got_rev = -1
-
+                got_rev = ss.revision
 
-                # We ignore all builds that don't have last revisions.
-                # TODO(nsylvain): If the build is over, maybe it was a problem
-                # with the update source step. We need to find a way to tell the
-                # user that his change might have broken the source update.
-                if got_rev != -1:
-                    details = self.getBuildDetails(request, builderName, build)
-                    devBuild = DevBuild(got_rev, build, details)
-                    builds.append(devBuild)
-
-                    # Now break if we have enough builds.
-                    current_revision = self.getChangeForBuild(
-                        build, revision)
-                    if self.comparator.isRevisionEarlier(
-                        devBuild, current_revision):
-                        break
+            # We ignore all builds that don't have last revisions.
+            # TODO(nsylvain): If the build is over, maybe it was a problem
+            # with the update source step. We need to find a way to tell the
+            # user that his change might have broken the source update.
+            if got_rev is not None:
+                number += 1
+                details = self.getBuildDetails(request, builderName, build)
+                devBuild = DevBuild(got_rev, build, details)
+                builds.append(devBuild)
+
+                # Now break if we have enough builds.
+                current_revision = self.getChangeForBuild(
+                    build, revision)
+                if self.comparator.isRevisionEarlier(
+                    devBuild, current_revision):
+                    break
 
             build = build.getPreviousBuild()
 
@@ -279,13 +284,14 @@ def getChangeForBuild(self, build, revision):
         changes.sort(key=self.comparator.getSortingKey())
         return changes[-1]
 
-    def getAllBuildsForRevision(self, status, request, lastRevision, numBuilds,
-                                categories, builders, debugInfo):
+    def getAllBuildsForRevision(self, status, request, codebase, lastRevision,
+                                numBuilds, categories, builders, debugInfo):
         """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
         builders we care about. The key is it's category.
  
+        codebase is the codebase to get revisions from
         lastRevision is the last revision we want to display in the page.
         categories is a list of categories to display. It is coming from the
             HTTP GET parameters.
@@ -327,6 +333,7 @@ def getAllBuildsForRevision(self, status, request, lastRevision, numBuilds,
             allBuilds[builderName] = self.getBuildsForRevision(request,
                                                                builder,
                                                                builderName,
+                                                               codebase,
                                                                lastRevision,
                                                                numBuilds,
                                                                debugInfo)
@@ -523,14 +530,16 @@ def filterRevisions(self, revisions, filter=None, max_revs=None):
                 except DoesNotPassFilter:
                     pass
 
-    def displayPage(self, request, status, builderList, allBuilds, revisions,
-                    categories, repository, project, branch, debugInfo):
+    def displayPage(self, request, status, builderList, allBuilds, codebase,
+                    revisions, categories, repository, project, branch,
+                    debugInfo):
         """Display the console page."""
         # Build the main template directory with all the informations we have.
         subs = dict()
         subs["branch"] = branch or 'trunk'
         subs["repository"] = repository
         subs["project"] = project
+        subs["codebase"] = codebase
         if categories:
             subs["categories"] = ' '.join(categories)
         subs["time"] = time.strftime("%a %d %b %Y %H:%M:%S",
@@ -618,6 +627,8 @@ def content(self, request, cxt):
         project = request.args.get("project", [None])[0]
         # Branch used to filter the changes shown.
         branch = request.args.get("branch", [ANYBRANCH])[0]
+        # Codebase used to filter the changes shown.
+        codebase = request.args.get("codebase", [None])[0]
         # List of all the committers name to display on the page.
         devName = request.args.get("name", [])
 
@@ -648,6 +659,8 @@ def got_changes(allChanges):
                 revFilter['repository'] = repository
             if project:
                 revFilter['project'] = project
+            if codebase is not None:
+                revFilter['codebase'] = codebase
             revisions = list(self.filterRevisions(allChanges, max_revs=numRevs,
                                                             filter=revFilter))
             debugInfo["revision_final"] = len(revisions)
@@ -662,6 +675,7 @@ def got_changes(allChanges):
 
                 (builderList, allBuilds) = self.getAllBuildsForRevision(status,
                                                     request,
+                                                    codebase,
                                                     lastRevision,
                                                     numBuilds,
                                                     categories,
@@ -671,8 +685,9 @@ def got_changes(allChanges):
             debugInfo["added_blocks"] = 0
 
             cxt.update(self.displayPage(request, status, builderList,
-                                        allBuilds, revisions, categories,
-                                        repository, project, branch, debugInfo))
+                                        allBuilds, codebase, revisions,
+                                        categories, repository, project,
+                                        branch, debugInfo))
 
             templates = request.site.buildbot_service.templates
             template = templates.get_template("console.html")

master/buildbot/status/web/templates/console.html

@@ -86,6 +86,9 @@ <h1>Console View</h1>
 {% if categories|length > 1 %}
         <br><b>Categories:</b> {% for c in categories %}{{ c.name|e }} {% endfor %}
 {% endif %}
+{% if codebase %}
+        <br><b>Codebase:</b> {{ codebase|e }}
+{% endif %}
 {% if repository %}
         <br><b>Repository:</b> {{ repository|e }}
 {% endif %}

master/docs/manual/cfg-statustargets.rst

@@ -255,7 +255,8 @@ be used to access them.
     more ``category=`` query arguments to the URL will limit the display to
     Builders that were defined with one of the given categories.  With the
     ``project=`` query argument, it's possible to restrict the view to changes
-    from the given project.
+    from the given project.  With the ``codebase=`` query argument, it's possible
+    to restrict the view to changes for the given codebase.
 
     By adding one or more ``name=`` query arguments to the URL, the console view is
     restricted to only showing changes made by the given users.