Add " (CQ)" to the author name if the commit-queue was used.

changes/svnpoller.py

 # -*- test-case-name: buildbot.test.test_svnpoller -*-
 
 # Based on the work of Dave Peticolas for the P4poll
 # Changed to svn (using xml.dom.minidom) by Niklaus Giger
 # Hacked beyond recognition by Brian Warner
 
 from twisted.python import log
 from twisted.internet import defer, reactor, utils
 from twisted.internet.task import LoopingCall
 
@@ skipping 299 matching lines @@
                 (self.svnurl, root))
         self._prefix = self.svnurl[len(root):]
         if self._prefix.startswith("/"):
             self._prefix = self._prefix[1:]
         log.msg("SVNPoller: svnurl=%s, root=%s, so prefix=%s" %
                 (self.svnurl, root, self._prefix))
         return self._prefix
 
     def get_logs(self, ignored_prefix=None):
         args = []
-        args.extend(["log", "--xml", "--verbose", "--non-interactive"])
+        args.extend(["log", "--xml", "--verbose", "--non-interactive",

[M-A Ruel, 2011/12/07 17:09:42]

Please create a class in scripts/master/ overriding this class and add the
functionality there.

It is especially important as the main waterfall is using buildbot 8.4p1. :)

Afterward we can upstream the change once we know it's working.

+            "--with-all-revprops"])
         if self.svnuser:
             args.extend(["--username=%s" % self.svnuser])
         if self.svnpasswd:
             args.extend(["--password=%s" % self.svnpasswd])
         args.extend(["--limit=%d" % (self.histmax), self.svnurl])
         d = self.getProcessOutput(args)
         return d
 
     def parse_logs(self, output):
         # parse the XML output, return a list of <logentry> nodes
@@ skipping 77 matching lines @@
         relative_path = path[len(self._prefix):]
         if relative_path.startswith("/"):
             relative_path = relative_path[1:]
         where = self.split_file(relative_path)
         # 'where' is either None or (branch, final_path)
         return where
 
     def create_changes(self, new_logentries):
         changes = []
 
+        def commit_bot_used(logentry):
+            revprops = logentry.getElementsByTagName('revprops')
+            if revprops is not None:
+                for revprop in revprops.getElementsByTagName('property'):
+                    if revprop.getAttribute("name") == "commit-bot":
+                        return True
+            return False
+
         for el in new_logentries:
             branch_files = [] # get oldest change first
             revision = str(el.getAttribute("revision"))
 
             revlink=''
 
             if self.revlinktmpl:
                 if revision:
                     revlink = self.revlinktmpl % urllib.quote_plus(revision)
 
             dbgMsg("Adding change revision %s" % (revision,))
             # TODO: the rest of buildbot may not be ready for unicode 'who'
             # values
             author   = self._get_text(el, "author")
             comments = self._get_text(el, "msg")
+
+            # If commit-bot was used, then add (CQ)
+            if commit_bot_used(el):
+                author += " (CQ)"

[M-A Ruel, 2011/12/07 17:09:42]

You can't, as this is used to create the blamelist, which is used to send
emails. It needs to be modified in the buildbot/status/* part.

Since the waterfall and console use different layout, you need to do this two
times, one in 
buildbot/status/web/console.py and one in buildbot/status/web/waterfall.py. No
need to do both in a single CL.

But I feel like if you modify _revlinkcfg() in buildbot/status/web/base.py, that
would work better. In that case, you'll need to modify the sources in place and
update build/third_party/buildbot_8_4p1/README.chromium with the corresponding
patch.

+
             # there is a "date" field, but it provides localtime in the
             # repository's timezone, whereas we care about buildmaster's
             # localtime (since this will get used to position the boxes on
             # the Waterfall display, etc). So ignore the date field and use
             # our local clock instead.
             #when     = self._get_text(el, "date")
             #when     = time.mktime(time.strptime("%.19s" % when,
             #                                     "%Y-%m-%dT%H:%M:%S"))
             branches = {}
             pathlist = el.getElementsByTagName("paths")[0]
@@ skipping 49 matching lines @@
         assert self.working
         self.working = False
         return res
 
     def finished_failure(self, f):
         log.msg("SVNPoller failed")
         dbgMsg('_finished : %s' % f)
         assert self.working
         self.working = False
         return None # eat the failure