[pypy-commit] buildbot buildbot-update: show builds without a branch and for the default branch as , replacing

[bivab]

Author: David Schneider <david.schnei...@picle.org>
Branch: buildbot-update
Changeset: r842:abef23b33519
Date: 2013-08-29 13:33 +0200
http://bitbucket.org/pypy/buildbot/changeset/abef23b33519/

Log:    show builds without a branch and for the default branch as
        <default>, replacing <trunk>

diff --git a/bot2/pypybuildbot/summary.py b/bot2/pypybuildbot/summary.py
--- a/bot2/pypybuildbot/summary.py
+++ b/bot2/pypybuildbot/summary.py
@@ -374,7 +374,7 @@
 
     def _start_cat_branch(self, cat_branch, fine=False):
         category, branch = cat_branch
-        branch = trunk_name(branch)
+        branch = default_name(branch)
         category = category_name(category)
 
         self.cur_cat_branch = (category, branch)
@@ -615,14 +615,16 @@
         return lambda v: v in membs
 
 def make_subst(v1, v2):
+    if not isinstance(v1, list):
+        v1 = [v1]
     def subst(v):
-        if v == v1:
+        if v in v1:
             return v2
         return v
     return subst
 
-trunk_name = make_subst(None, "<trunk>")
-trunk_value = make_subst("<trunk>", None)
+default_name = make_subst(['default', None], '<default>')
+default_value = make_subst(['default', '<default>'], ['default', None])
 category_name = make_subst(None, '-')
 nocat_value = make_subst("-", None)
 
@@ -825,7 +827,13 @@
         only_branches = request.args.get('branch', None)
         only_recentrevs = request.args.get('recentrev', None)
         if only_branches is not None:
-            only_branches = map(trunk_value, only_branches)
+            branches = []
+            for x in map(default_value, only_branches):
+                if isinstance(x, str):
+                    branches.append(x)
+                else:
+                    branches.extend(x)
+            only_branches = branches
         only_builder = request.args.get('builder', None)
         only_builds = None
         if only_builder is not None:
@@ -861,16 +869,16 @@
                                          outcome_set_cache.stats()))
 
         if request.args:
-            trunk_vs_any_text = "filter nothing"
-            trunk_vs_any_query = ""
+            default_vs_any_text = "filter nothing"
+            default_vs_any_query = ""
         else:
-            trunk_vs_any_text = "all <trunk>"
-            trunk_vs_any_query = "?branch=<trunk>"
+            default_vs_any_text = "all <default>"
+            default_vs_any_query = "?branch=<default>"
 
-        trunk_vs_any_anchor = html.a(trunk_vs_any_text,
+        default_vs_any_anchor = html.a(default_vs_any_text,
                                      href="/summary%s" %
-                                     trunk_vs_any_query,
+                                     default_vs_any_query,
                                      class_="failSummary trunkVsAny")
-        trunk_vs_any = html.div(trunk_vs_any_anchor,
+        default_vs_any = html.div(default_vs_any_anchor,
                                 style="position: absolute; right: 5%;")
-        return trunk_vs_any.unicode() + page.render()
+        return default_vs_any.unicode() + page.render()
diff --git a/master/public_html/index.html b/master/public_html/index.html
--- a/master/public_html/index.html
+++ b/master/public_html/index.html
@@ -10,10 +10,10 @@
 
 <ul>
   <li>the <a href="http://speed.pypy.org/";>Performance Plots</a> will give you 
an overview of performance for recent revisions.</li>
-  <li>the <a href="summary?branch=&lt;trunk&gt;">Summary Display 
&lt;trunk&gt;</a> will give you a 
-  failure-oriented  summary for recent revisions (&lt;trunk&gt; only).</li>
+  <li>the <a href="summary?branch=default">Summary Display &lt;default&gt;</a> 
will give you a
+  failure-oriented  summary for recent revisions (&lt;default&gt; only).</li>
 
-  <li>the <a href="summary">Summary Display</a> will give you a 
+  <li>the <a href="summary">Summary Display</a> will give you a
   failure-oriented  summary for recent revisions (all branches).</li>
 
   <li>the <a href="waterfall">Waterfall Display</a> will give you a
diff --git a/master/templates/layout.html b/master/templates/layout.html
--- a/master/templates/layout.html
+++ b/master/templates/layout.html
@@ -26,7 +26,7 @@
         -
         <!-- PyPy specific items -->
         <a href="http://speed.pypy.org/";>Speed</a>
-        <a href="{{ path_to_root }}summary?branch=&lt;trunk&gt;">Summary 
(trunk)</a>
+        <a href="{{ path_to_root }}summary?branch=&lt;default&gt;">Summary 
(default)</a>
         <a href="{{ path_to_root }}summary">Summary</a>
         <a href="{{ path_to_root }}nightly/">Nightly builds</a>
         <!-- end of PyPy specific items -->
@@ -46,9 +46,9 @@
 
     {%- block barecontent -%}
     <hr/>
-    
+
     {% if alert_msg != "" %}
-    <div class="alert">    
+    <div class="alert">
     {{ alert_msg }}
     </div>
     {% endif %}
diff --git a/master/templates/root.html b/master/templates/root.html
--- a/master/templates/root.html
+++ b/master/templates/root.html
@@ -28,9 +28,9 @@
   </li>
 
   <li class="{{ item_class.next() }}">
-    The <a href="summary?branch=&lt;trunk&gt;">Summary Display
-    &lt;trunk&gt;</a> will give you a failure-oriented summary for recent
-    revisions (&lt;trunk&gt; only).
+    The <a href="summary?branch=&lt;default&gt;">Summary Display
+    &lt;default&gt;</a> will give you a failure-oriented summary for recent
+    revisions (&lt;default&gt; only).
   </li>
 
   <li class="{{ item_class.next() }}">
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit