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

Jelmer Vernooij jelmer at samba.org
Sun Nov 21 17:39:09 MST 2010


The branch, master has been updated
       via  2f73f52 Include host link.
      from  e05fd22 Add links to previous builds.

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


- Log -----------------------------------------------------------------
commit 2f73f52b7d65694b8a863ee313df814a0528c88c
Author: Jelmer Vernooij <jelmer at samba.org>
Date:   Mon Nov 22 01:38:24 2010 +0100

    Include host link.

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

Summary of changes:
 buildfarm/web/__init__.py |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)


Changeset truncated at 500 lines:

diff --git a/buildfarm/web/__init__.py b/buildfarm/web/__init__.py
index 2becc7f..5b2827f 100755
--- a/buildfarm/web/__init__.py
+++ b/buildfarm/web/__init__.py
@@ -144,16 +144,9 @@ def host_link(myself, host):
 
 def revision_link(myself, revision, tree):
     """return a link to a particular revision"""
-
     if revision is None:
         return "unknown"
-
-    revision = revision.lstrip()
-    rev_short = revision
-    if len(revision) == 40:
-        rev_short = re.sub("(^.{7}).*", "\\1(git)", rev_short)
-
-    return "<a href='%s?function=diff;tree=%s;revision=%s' title='View Diff for %s'>%s</a>" % (myself, tree, revision, revision, rev_short)
+    return "<a href='%s?function=diff;tree=%s;revision=%s' title='View Diff for %s'>%s</a>" % (myself, tree, revision, revision, revision[:7])
 
 
 def subunit_to_buildfarm_result(subunit_result):
@@ -814,7 +807,8 @@ class HistoryPage(BuildFarmPage):
         yield "<div class=\"builds\">\n"
         yield "<span class=\"label\">Builds: </span>\n"
         for build in self.buildfarm.get_revision_builds(tree.name, entry.revision):
-            yield "%s " % build_status_html(myself, build)
+            yield "%s(%s) " % (build_status_html(myself, build),
+                               host_link(myself, build.host))
         yield "</div>\n"
 
         yield "</div>\n"


-- 
build.samba.org


More information about the samba-cvs mailing list