Commits

Anonymous committed c0786d0

Fix bad link to revision in builders/<builder>/builds/N

Comments (0)

Files changed (4)

master/status/web/base.py

                   'rev': rev,
                   'rev_repo' : repo,
 		  'rev_short': rev[:12],
+	          'change_url': os.path.join(repo,rev[:12]).replace('vabs//changeset','vabs/changeset'),
 		  'buildbranch' : buildbranch,
                   'time': time.strftime(self.LINE_TIME_FORMAT,
                                         time.localtime(build.getTimes()[0])),

master/status/web/templates/build_line.html

   currently running on it -->
   <small>({{ b.time }})</small>
   <!--  Rev: {{ b.rev|shortrev(b.rev_repo) }} -->
-  	Rev: <a href="http://bitbucket.org/VLCore/vabs/changeset/{{ b.rev_short}}"> {{b.rev_short}}</a>
+	Rev: <a href="http://bitbucket.org/VLCore/vabs/changeset/{{ b.rev_short}}"> {{b.rev_short}}</a>
 	<!-- Rev: {{ b.rev_short }} -->
   <span class="{{ b.class }}">{{ b.results }}</span>
   {% if include_builder %}
 	  <td>{{ b.rev|shortrev(b.rev_repo) }}</td>
 	  -->
 	  <!-- <td>{{ b.rev_short }} </td> -->
-	  <td><a href="http://bitbucket.org/VLCore/vabs/changeset/{{ b.rev_short }}"> {{b.rev_short}}</a>
+	  <td><a href="http://bitbucket.org/VLCore/vabs/changeset/{{ b.rev_short }}"> {{b.rev_short}}</a> </td>
     <td class="{{ b.class }}">{{ b.results }}</td>
   {%- if include_builder %}    
     <td><a href="{{ b.builderurl }}">{{ b.builder_name }}</a></td>

master/status/web/templates/change_macros.html

   {% endif %} {% if c.rev %}
   <tr class="{{ row_class.next() }}">
     <td class="left">Revision</td>
-    <td>{%- if c.revlink -%}<a href="{{ c.revlink }}">{{ c.rev|e }}</a>
+    <td>{%- if c.revlink -%}<a href="{{ c.revlink.replace('vabs//','vabs/') }}">{{ c.rev|e }}</a>
     {%- else -%}{{ c.rev|revlink(c.repository) }} {%- endif -%}</td>
   </tr>
   {% endif %}

master/status/words.py

         f.close()
         
 
-
-
 class IRCContact(base.StatusReceiver):
     implements(IStatusReceiver)
     """I hold the state for a single user's interaction with the buildbot.
 	    print "Restarting master"
 	    self.send("Restarting master... brb (I hope)")
 	    sp.call(['buildbot','reconfig'])
-#	    time.sleep(5)
-#	    sp.call(['buildbot', 'start'])
-            #sp.call(['buildbot', 'restart'])
         t = threading.Thread(target=do_restart, args=())
-#        self.send("Restarting master... brb (I hope)")
         return t.start()
 
     def reconfig(self):
         self.subscribed = 0
         self.muted = False
         self.useRevisions = bot.useRevisions
-        self.useColors = bot.useColors
+        self.useColors = True #bot.useColors
         self.reported_builds = [] # tuples (when, buildername, buildnum)
         self.add_notification_events(bot.notify_events)
         self.manifest = Manifest(os.path.join(self.master.basedir, 'manifest'))