[Buildbot-commits] buildbot/buildbot/status/web base.py,1.18,1.19

[Brian Warner]

Update of /cvsroot/buildbot/buildbot/buildbot/status/web
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv27398/buildbot/status/web

Modified Files:
	base.py 
Log Message:
[project @ web map_branches: map 'trunk' to ['trunk',None], since some VC systems really do use 'trunk']

Original author: warner at lothar.com
Date: 2007-09-30 19:12:11+00:00

Index: base.py
===================================================================
RCS file: /cvsroot/buildbot/buildbot/buildbot/status/web/base.py,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- base.py	30 Sep 2007 19:00:37 -0000	1.18
+++ base.py	30 Sep 2007 19:12:48 -0000	1.19
@@ -341,6 +341,9 @@
 def map_branches(branches):
     # when the query args say "trunk", present that to things like
     # IBuilderStatus.generateFinishedBuilds as None, since that's the
-    # convention in use. In the long run we should clean this up better,
+    # convention in use. But also include 'trunk', because some VC systems
+    # refer to it that way. In the long run we should clean this up better,
     # maybe with Branch objects or something.
-    return [b != "trunk" and b or None for b in branches]
+    if "trunk" in branches:
+        return branches + [None]
+    return branches