[SCM] build.samba.org - branch master updated

[Jelmer Vernooij]

The branch, master has been updated
       via  f4460a7 Allow viewing trees.
      from  c269e8a allow non-html pages more easily.

http://gitweb.samba.org/?p=build-farm.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit f4460a7c342e7606d3d0a468f9f99677724a3b12
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Sat Dec 4 03:36:08 2010 +0100

    Allow viewing trees.

-----------------------------------------------------------------------

Summary of changes:
 buildfarm/web/__init__.py |   17 +++++++++++------
 1 files changed, 11 insertions(+), 6 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index b2ef29b..d8ccf93 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -129,7 +129,7 @@ def build_link(myself, build):
 
 
 def host_uri(myself, host):
-    return "%s?function=View+Host;host=%s" % (myself, host)
+    return "%s/host/%s" % (myself, host)
 
 def host_link(myself, host):
     return "<a href='%s'>%s</a>" % (host_uri(myself, host), host)
@@ -957,9 +957,14 @@ class BuildFarmApp(object):
                 yield "".join(self.html_page(form, page.render(myself, tree, revision)))
             else:
                 fn = wsgiref.util.shift_path_info(environ)
-                if fn == "recent":
-                    page = ViewRecentBuildsPage(self.buildfarm)
-                    yield "".join(self.html_page(form, page.render(myself, wsgiref.util.shift_path_info(environ), get_param(form, 'sortby') or 'age')))
+                if fn == "tree":
+                    tree = wsgiref.util.shift_path_info(environ)
+                    subfn = wsgiref.util.shift_path_info(environ)
+                    if subfn in ("", None, "+recent"):
+                        page = ViewRecentBuildsPage(self.buildfarm)
+                        yield "".join(self.html_page(form, page.render(myself, tree, get_param(form, 'sortby') or 'age')))
+                    else:
+                        yield "Unknown subfn %s" % subfn
                 elif fn == "host":
                     page = ViewHostPage(self.buildfarm)
                     yield "".join(self.html_page(form, page.render_html(myself, wsgiref.util.shift_path_info(environ))))
@@ -975,9 +980,9 @@ class BuildFarmApp(object):
                             yield build.read_subunit().read()
                         except NoTestOutput:
                             yield "There was no test output"
-                    elif subfn == "":
+                    elif subfn in ("", None):
                         yield "".join(self.html_page(form, page.render(myself, build, False)))
-                elif fn == "":
+                elif fn in ("", None):
                     page = ViewSummaryPage(self.buildfarm)
                     yield "".join(self.html_page(form, page.render_html(myself)))
                 else:


-- 
build.samba.org