David Schneider avatar David Schneider committed 3781586

keep trunk as meta-branch that groups default and builds without an explicit branch

Comments (0)

Files changed (3)

bot2/pypybuildbot/summary.py

     return subst
 
 # Map certain branch names from SourceStamps to a common name shown on the page
-meta_branch_name = make_subst(['default', '', None], '<default>')
-# map the meta-branch <default> to the actual branch entries from the
+meta_branch_name = make_subst(['default', '', None], '<trunk>')
+# map the meta-branch <trunk> to the actual branch entries from the
 # SourceStamp
-default_value = make_subst('<default>', ['default', '', None])
+default_value = make_subst('<trunk>', ['default', '', None])
 category_name = make_subst(None, '-')
 nocat_value = make_subst("-", None)
 
             default_vs_any_text = "filter nothing"
             default_vs_any_query = ""
         else:
-            default_vs_any_text = "all <default>"
-            default_vs_any_query = "?branch=<default>"
+            default_vs_any_text = "all <trunk>"
+            default_vs_any_query = "?branch=<trunk>"
 
         default_vs_any_anchor = html.a(default_vs_any_text,
                                      href="/summary%s" %

bot2/pypybuildbot/test/test_summary.py

     builder.nextBuildNumber = n
 
 
-METABRANCH = '<default>'
+METABRANCH = '<trunk>'
 
 
 class TestSummary(object):

master/templates/layout.html

         -
         <!-- PyPy specific items -->
         <a href="http://speed.pypy.org/">Speed</a>
-        <a href="{{ path_to_root }}summary?branch=&lt;default&gt;">Summary (default)</a>
+        <a href="{{ path_to_root }}summary?branch=&lt;trunk&gt;">Summary (trunk)</a>
         <a href="{{ path_to_root }}summary">Summary</a>
         <a href="{{ path_to_root }}nightly/">Nightly builds</a>
         <!-- end of PyPy specific items -->
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.